Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone In directory usw-pr-cvs1:/tmp/cvs-serv17139 Modified Files: OzoneAssociation.java OzoneAssociationImpl.java OzoneBaseName.java OzoneBaseNameImpl.java OzoneMember.java OzoneMemberImpl.java OzoneOccurrence.java OzoneOccurrenceImpl.java OzoneScope.java OzoneScopeImpl.java OzoneScopedObject.java OzoneScopedObjectImpl.java OzoneTopic.java OzoneTopicImpl.java OzoneTopicMap.java OzoneTopicMapFactoryImpl.java OzoneTopicMapImpl.java OzoneTopicMapObject.java OzoneTopicMapObjectImpl.java OzoneTopicMapUtils.java OzoneTopicMapUtilsImpl.java OzoneVariant.java OzoneVariantImpl.java OzoneVariantName.java OzoneVariantNameImpl.java Log Message: - changed: license and author notice Index: OzoneAssociation.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneAssociation.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneAssociation.java 2001/05/29 17:32:45 1.1 --- OzoneAssociation.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 29,32 **** --- 28,34 ---- * @see com.techquila.topicmap.Member * @see com.techquila.topicmap.ScopedObject + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public abstract interface OzoneAssociation extends OzoneScopedObject, Association { Index: OzoneAssociationImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneAssociationImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneAssociationImpl.java 2001/05/29 17:32:45 1.1 --- OzoneAssociationImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 30,33 **** --- 29,35 ---- * @see com.techquila.topicmap.Topic * @see com.techquila.topicmap.Member + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneAssociationImpl extends OzoneScopedObjectImpl Index: OzoneBaseName.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneBaseName.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneBaseName.java 2001/05/29 17:32:45 1.1 --- OzoneBaseName.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 18,22 **** ! /** */ public interface OzoneBaseName extends OzoneScopedObject, BaseName { --- 17,25 ---- ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public interface OzoneBaseName extends OzoneScopedObject, BaseName { Index: OzoneBaseNameImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneBaseNameImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneBaseNameImpl.java 2001/05/29 17:32:45 1.1 --- OzoneBaseNameImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 23,26 **** --- 22,28 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneBaseNameImpl extends OzoneScopedObjectImpl Index: OzoneMember.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneMember.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneMember.java 2001/05/29 17:32:45 1.1 --- OzoneMember.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 18,22 **** ! /** */ public interface OzoneMember extends OzoneTopicMapObject, Member { --- 17,25 ---- ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public interface OzoneMember extends OzoneTopicMapObject, Member { Index: OzoneMemberImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneMemberImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneMemberImpl.java 2001/05/29 17:32:45 1.1 --- OzoneMemberImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 22,25 **** --- 21,27 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneMemberImpl extends OzoneScopedObjectImpl Index: OzoneOccurrence.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneOccurrence.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneOccurrence.java 2001/05/29 17:32:45 1.1 --- OzoneOccurrence.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 25,28 **** --- 24,30 ---- * * @see Topic + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneOccurrence extends OzoneScopedObject, Occurrence { Index: OzoneOccurrenceImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneOccurrenceImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneOccurrenceImpl.java 2001/05/29 17:32:45 1.1 --- OzoneOccurrenceImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 24,27 **** --- 23,29 ---- * An occurrence may be scoped and may contain either an in-line data resource (as a string) or * a reference to an external resource (specified as a URI). + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneOccurrenceImpl extends OzoneScopedObjectImpl Index: OzoneScope.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScope.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneScope.java 2001/05/29 17:32:45 1.1 --- OzoneScope.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 15,18 **** --- 14,20 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneScope extends OzoneTopicMapObject, Scope { Index: OzoneScopeImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopeImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneScopeImpl.java 2001/05/29 17:32:45 1.1 --- OzoneScopeImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 26,29 **** --- 25,31 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneScopeImpl extends OzoneTopicMapObjectImpl Index: OzoneScopedObject.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopedObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneScopedObject.java 2001/05/29 17:32:45 1.1 --- OzoneScopedObject.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 18,22 **** ! /** */ public interface OzoneScopedObject extends OzoneTopicMapObject, ScopedObject { --- 17,25 ---- ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public interface OzoneScopedObject extends OzoneTopicMapObject, ScopedObject { Index: OzoneScopedObjectImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopedObjectImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneScopedObjectImpl.java 2001/05/29 17:32:45 1.1 --- OzoneScopedObjectImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 20,23 **** --- 19,25 ---- /** * Base class for all topic map objects which have a validity scope. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public abstract class OzoneScopedObjectImpl extends OzoneTopicMapObjectImpl Index: OzoneTopic.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopic.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopic.java 2001/05/29 17:32:45 1.1 --- OzoneTopic.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 23,26 **** --- 22,28 ---- /** * This interface describes a Topic (<code>topic</code>) construct in a Topic Map + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneTopic extends OzoneScopedObject, Topic { Index: OzoneTopicImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicImpl.java 2001/05/29 17:32:45 1.1 --- OzoneTopicImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 41,44 **** --- 40,46 ---- /** * Defines a single topic in the TopicMap. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneTopicImpl extends OzoneScopedObjectImpl implements OzoneTopic { Index: OzoneTopicMap.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMap.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMap.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 26,29 **** --- 25,31 ---- /** * This interface defines the whole Topic Map construct. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneTopicMap extends OzoneTopicMapObject, TopicMap { Index: OzoneTopicMapFactoryImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapFactoryImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapFactoryImpl.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapFactoryImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 32,38 **** /** * Implements the TopicMapFactory interface for creating in-memory Topic Map objects. */ public class OzoneTopicMapFactoryImpl extends Object ! implements TopicMapFactory { public final static String DEFAULT_BASE_URL = "http://topicmap.techquila.com/default"; --- 31,40 ---- /** * Implements the TopicMapFactory interface for creating in-memory Topic Map objects. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneTopicMapFactoryImpl extends Object ! implements TopicMapFactory, java.io.Serializable { public final static String DEFAULT_BASE_URL = "http://topicmap.techquila.com/default"; Index: OzoneTopicMapImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapImpl.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 45,48 **** --- 44,50 ---- * The TopicMap is the root container for all of the other topic map objects. * This implementation of the TopicMap interface maintains all indices in memory. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneTopicMapImpl extends OzoneTopicMapObjectImpl Index: OzoneTopicMapObject.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapObject.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapObject.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapObject.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 19,23 **** ! /** */ public interface OzoneTopicMapObject extends OzoneRemote, TopicMapObject, PropertyChangeListener { --- 18,26 ---- ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public interface OzoneTopicMapObject extends OzoneRemote, TopicMapObject, PropertyChangeListener { Index: OzoneTopicMapObjectImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapObjectImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapObjectImpl.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapObjectImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 14,18 **** import com.techquila.topicmap.TopicMapObject; ! import com.techquila.utils.MultiValuePropertyChangeSupport; import java.util.HashMap; --- 13,17 ---- import com.techquila.topicmap.TopicMapObject; ! import com.techquila.utils.MultiValuePropertyChangeEvent; import java.util.HashMap; *************** *** 24,27 **** --- 23,29 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public abstract class OzoneTopicMapObjectImpl extends OzoneObject *************** *** 30,41 **** final static long serialVersionUID = 1L; - private static boolean useChangeSupport = true; - - /** */ ! protected HashMap m_namedPropertyListeners; ! protected ArrayList m_allPropertyListeners; ! protected transient MultiValuePropertyChangeSupport m_changeSupport; /** */ protected String m_id; --- 32,40 ---- final static long serialVersionUID = 1L; /** */ ! private final static String ALL_PROPERTIES = "__ALL__PROPERTIES__"; ! protected HashMap m_propertyListeners = new HashMap(); + /** */ protected String m_id; *************** *** 45,51 **** /** */ public OzoneTopicMapObjectImpl() { - if (useChangeSupport) { - m_changeSupport = new MultiValuePropertyChangeSupport( this ); - } } --- 44,47 ---- *************** *** 78,114 **** /** */ ! public void addPropertyChangeListener( String propertyName, ! PropertyChangeListener listener ) { ! if (useChangeSupport) { ! m_changeSupport.addPropertyChangeListener( propertyName, listener ); ! ! } else { ! if (m_namedPropertyListeners == null) { ! m_namedPropertyListeners = new HashMap(); ! } ! ! ArrayList propListeners = (ArrayList)m_namedPropertyListeners.get( propertyName ); ! if (propListeners == null) { ! propListeners = new ArrayList(); ! } ! propListeners.add( listener ); ! m_namedPropertyListeners.put( propertyName, propListeners ); ! } } /** */ ! public void addPropertyChangeListener( PropertyChangeListener listener ) { ! if (useChangeSupport) { ! m_changeSupport.addPropertyChangeListener( listener ); ! ! } else { ! if (m_allPropertyListeners == null) { ! m_allPropertyListeners = new ArrayList(); ! } ! if (!m_allPropertyListeners.contains( listener )) { ! m_allPropertyListeners.add( listener ); ! } } } --- 74,92 ---- /** */ ! public void addPropertyChangeListener( PropertyChangeListener listener ) { ! addPropertyChangeListener( ALL_PROPERTIES, listener ); } /** */ ! public void addPropertyChangeListener( String propertyName, ! PropertyChangeListener listener ) { ! ArrayList listeners = (ArrayList)m_propertyListeners.get( propertyName ); ! if (listeners == null) { ! listeners = new ArrayList(); ! m_propertyListeners.put( listeners, propertyName ); } + + listeners.add( propertyName ); } *************** *** 116,123 **** /** */ public void removePropertyChangeListener( PropertyChangeListener listener ) { ! if (useChangeSupport) { ! m_changeSupport.removePropertyChangeListener( listener ); ! } else { ! m_allPropertyListeners.remove( listener ); } } --- 94,100 ---- /** */ public void removePropertyChangeListener( PropertyChangeListener listener ) { ! for (Iterator it = m_propertyListeners.values().iterator(); it.hasNext(); ) { ! ArrayList listeners = (ArrayList)it.next(); ! listeners.remove( listener ); } } *************** *** 127,157 **** public void firePropertyChange( String propertyName, Object oldVal, Object newVal ) { ! ! if (useChangeSupport) { ! m_changeSupport.firePropertyChange( propertyName, oldVal, newVal ); ! ! } else { ! if (m_namedPropertyListeners != null) { ! ArrayList propListeners = (ArrayList)m_namedPropertyListeners.get( propertyName ); ! if (propListeners != null) { ! ! Iterator i = propListeners.iterator(); ! while (i.hasNext()) { ! PropertyChangeListener l = (PropertyChangeListener)i.next(); ! l.propertyChange( new PropertyChangeEvent( ! this, propertyName, oldVal, newVal ) ); ! } ! } ! } ! ! if (m_allPropertyListeners != null) { ! Iterator i = m_allPropertyListeners.iterator(); ! while (i.hasNext()) { ! PropertyChangeListener l = (PropertyChangeListener)i.next(); ! l.propertyChange( new PropertyChangeEvent( ! this, propertyName, oldVal, newVal ) ); ! } ! } ! } } --- 104,111 ---- public void firePropertyChange( String propertyName, Object oldVal, Object newVal ) { ! PropertyChangeEvent event = new PropertyChangeEvent( ! this, propertyName, oldVal, newVal ); ! firePropertyChange( propertyName, event ); ! firePropertyChange( ALL_PROPERTIES, event ); } *************** *** 160,166 **** public void firePropertyChange( String propertyName, Object oldValue, int operation, Object operand, Object newValue ) { ! if (useChangeSupport) { ! m_changeSupport.firePropertyChange( propertyName, oldValue, ! operation, operand, newValue ); } } --- 114,131 ---- public void firePropertyChange( String propertyName, Object oldValue, int operation, Object operand, Object newValue ) { ! MultiValuePropertyChangeEvent event = new MultiValuePropertyChangeEvent( ! this, propertyName, oldValue, operation, operand, newValue ); ! firePropertyChange( propertyName, event ); ! firePropertyChange( ALL_PROPERTIES, event ); ! } ! ! ! /** */ ! private void firePropertyChange( String propertyName, PropertyChangeEvent event ) { ! ArrayList listeners = (ArrayList)m_propertyListeners.get( propertyName ); ! if (listeners != null) { ! for (Iterator it = listeners.iterator(); it.hasNext(); ) { ! ((PropertyChangeListener)it.next()).propertyChange( event ); ! } } } *************** *** 173,176 **** public void propertyChange( PropertyChangeEvent ev ) { } ! } --- 138,141 ---- public void propertyChange( PropertyChangeEvent ev ) { } ! } Index: OzoneTopicMapUtils.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapUtils.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapUtils.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 25,28 **** --- 24,30 ---- * * @see TopicMap + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneTopicMapUtils extends OzoneRemote, TopicMapUtils { Index: OzoneTopicMapUtilsImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapUtilsImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneTopicMapUtilsImpl.java 2001/05/29 17:32:45 1.1 --- OzoneTopicMapUtilsImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 33,36 **** --- 32,38 ---- * This means that this class may be used as the TopicMapUtils implementation for * any family of Topic Map objects which implement those interfaces. + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneTopicMapUtilsImpl extends OzoneObject Index: OzoneVariant.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariant.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneVariant.java 2001/05/29 17:32:45 1.1 --- OzoneVariant.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 18,21 **** --- 17,23 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public interface OzoneVariant extends OzoneBaseName, Variant { Index: OzoneVariantImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneVariantImpl.java 2001/05/29 17:32:45 1.1 --- OzoneVariantImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 23,26 **** --- 22,28 ---- /** + * + * @author <a href="mailto:ka...@te...">Kal Ahmed</a> + * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> */ public class OzoneVariantImpl extends OzoneBaseNameImpl Index: OzoneVariantName.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantName.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneVariantName.java 2001/05/29 17:32:45 1.1 --- OzoneVariantName.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 16,20 **** ! /** */ public interface OzoneVariantName extends OzoneTopicMapObject, VariantName { --- 15,23 ---- ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public interface OzoneVariantName extends OzoneTopicMapObject, VariantName { Index: OzoneVariantNameImpl.java =================================================================== RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantNameImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** OzoneVariantNameImpl.java 2001/05/29 17:32:45 1.1 --- OzoneVariantNameImpl.java 2001/06/01 16:56:15 1.2 *************** *** 1,8 **** /* * You can redistribute this software and/or modify it under the terms of ! * the Infozone Software License version 2 published by the Infozone Group ! * (http://www.infozone-group.org). * ! * Copyright (C) @year@ by The Infozone Group. All rights reserved. * * $Id$ --- 1,7 ---- /* * You can redistribute this software and/or modify it under the terms of ! * the TM4J Software License published with this distribution. * ! * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved. * * $Id$ *************** *** 17,21 **** import java.net.URL; ! public class OzoneVariantNameImpl extends OzoneTopicMapObjectImpl implements OzoneVariantName { --- 16,24 ---- import java.net.URL; ! /** ! * ! * @author <a href="mailto:ka...@te...">Kal Ahmed</a> ! * @author <a href="mailto:ge...@sm...">Gerd Mueller</a> ! */ public class OzoneVariantNameImpl extends OzoneTopicMapObjectImpl implements OzoneVariantName { |