[tracker/im: 2/2] NCO: Let IMAccount subclass IMContact to avoid duplicate properties

[Jürg Billeter <juergbi src gnome org>]

commit d98c25d419176d22a70af0179321d972346c1bd7
Author: Jürg Billeter <j bitron ch>
Date:   Tue Feb 2 15:42:54 2010 +0100

    NCO: Let IMAccount subclass IMContact to avoid duplicate properties
    
    Drop nco:imContactNickname, nco:imContactStatusMessage, and
    nco:imContactPresence in favor of nco:imNickname, nco:imStatusMessage,
    and nco:imPresence, respectively.

 data/ontologies/32-nco.ontology |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)
---
diff --git a/data/ontologies/32-nco.ontology b/data/ontologies/32-nco.ontology
index dc66e64..60336d7 100644
--- a/data/ontologies/32-nco.ontology
+++ b/data/ontologies/32-nco.ontology
@@ -53,12 +53,6 @@ nco:IMAddress a rdfs:Class ;
 	rdfs:comment "An instant messaging address such as xmpp:foo bar com " ;
 	rdfs:subClassOf nco:ContactMedium .
 
-nco:IMAccount a rdfs:Class ;
-	rdfs:label "IMAccount" ;
-	rdfs:comment "An account in an Instant Messaging system. Only user 'me' can have IM Accounts (check hasIMAccount). All other contacts in the address book can come from one (check nco:fromIMAccount). The properties in this class (id, status,...) refers only to 'me'. The specific details of contacts coming from that account are properties of IMContact." ;
-	tracker:notify true ;
-	rdfs:subClassOf nie:InformationElement .
-
 nco:OrganizationContact a rdfs:Class ;
 	rdfs:label "OrganizationContact" ;
 	rdfs:comment "A Contact that denotes on Organization." ;
@@ -77,6 +71,12 @@ nco:IMContact a rdfs:Class ;
 	rdfs:comment "Contact coming from an IM Account" ;
 	rdfs:subClassOf nco:PersonContact .
 
+nco:IMAccount a rdfs:Class ;
+	rdfs:label "IMAccount" ;
+	rdfs:comment "An account in an Instant Messaging system. Only user 'me' can have IM Accounts (check hasIMAccount). All other contacts in the address book can come from one (check nco:fromIMAccount). The properties in this class (id, status,...) refers only to 'me'. The specific details of contacts coming from that account are properties of IMContact." ;
+	tracker:notify true ;
+	rdfs:subClassOf nco:IMContact .
+
 nco:MetaContact a rdfs:Class ;
         rdfs:label "MetaContact" ;
 	rdfs:comment "A metacontact groups PersonContacts and IMContacts coming from different sources, indicating that are the same entity in the real world." ;
@@ -575,7 +575,7 @@ nco:imNickname a rdf:Property ;
 	rdfs:label "imNickname" ;
 	rdfs:comment "A nickname attached to a particular IM Account." ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMAccount ;
+	rdfs:domain nco:IMContact ;
 	rdfs:range xsd:string ;
 	tracker:fulltextIndexed true ;
 	tracker:weight 5 .
@@ -640,7 +640,7 @@ nco:imStatusMessage a rdf:Property ;
 	rdfs:label "imStatusMessage" ;
 	rdfs:comment "A feature common in most IM systems. A message left by the user for all his/her contacts to see." ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMAccount ;
+	rdfs:domain nco:IMContact ;
 	rdfs:range xsd:string .
 
 nco:imDisplayName a rdf:Property ;
@@ -681,20 +681,6 @@ nco:hasAffiliation a rdf:Property ;
 #
 # IM related properties
 #
-nco:imContactNickname a rdf:Property ;
-	rdfs:label "imContactNickname" ;
-	rdfs:comment "Visible nickname of the user in a service";
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range xsd:string .
-
-nco:imContactStatusMessage a rdf:Property ;
-	rdfs:label "imContactStatusMessage" ;
-	rdfs:comment "Status message of the user in a service";
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range xsd:string .
-
 nco:PresenceStatus a rdfs:Class ;
         rdfs:label "Presence statuses";
 	rdfs:comment "Predefined set of status level instances" ;
@@ -710,17 +696,10 @@ nco:presence-status-busy a nco:PresenceStatus .
 nco:presence-status-unknown a nco:PresenceStatus .
 nco:presence-status-error a nco:PresenceStatus .
 
-nco:imContactPresence a rdf:Property ;
-	rdfs:label "imContactPresence" ;
-	rdfs:comment "Online availability of the user in a service";
-	nrl:maxCardinality 1;
-	rdfs:domain nco:IMContact ;
-	rdfs:range nco:PresenceStatus .
-
 nco:imPresence a rdf:Property ;
 	rdfs:label "imPresence" ;
 	nrl:maxCardinality 1 ;
-	rdfs:domain nco:IMAccount ;
+	rdfs:domain nco:IMContact ;
 	rdfs:range nco:PresenceStatus .