From ff432bb7aad233cc5d9baf8df9ff3a9c21eae916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Mon, 15 Sep 2008 08:42:16 +0000
Subject: [PATCH] - reinstated init( onto, onto, cache ) in Alignment -
reimplemented init( onto, onto, cache ) in function of init( onto, onto ) in
BasicAlignement - transformed INRIA Rhone-Alpes into INRIA - new OMWG has
only init( onto, onto ) implemented and no reference to cache
---
html/relnotes.html | 8 ++++++--
lib/mappingapilite.jar | Bin 89813 -> 89781 bytes
.../exmo/align/impl/BasicAlignment.java | 10 +++++-----
.../exmo/align/impl/OWLAPIAlignment.java | 2 +-
.../exmo/align/impl/ObjectAlignment.java | 2 +-
src/org/semanticweb/owl/align/Alignment.java | 9 ++++++++-
6 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/html/relnotes.html b/html/relnotes.html
index 5dc51637..373b9837 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -39,8 +39,12 @@
<p>
<ul compact="1">
-<li><tt>OntologyCache</tt> is now local at each <tt>OntologyFactory</tt> (onto)</li>
-<li>Implement <tt>owlapi10</tt> as <tt>HeavyLoadedAlignment</tt> (onto)</li>
+<li><font color="red">Deprecated</font> <tt>Alignment.init(onto,onto,cache)</tt>
+ in favour of <tt>Alignment.init(onto,onto)</tt>, see below (api)</tt>
+<li><tt>OntologyCache</tt> is now local at
+ each <tt>OntologyFactory</tt>, it does not need to be manipulated
+ from outside (onto)</li>
+<li>Implementing <tt>owlapi10</tt> as <tt>HeavyLoadedAlignment</tt> (onto)</li>
<li>Started to put copyright notices to INRIA instead of INRIA Rhône-Alpes (misc)</li>
</ul>
</p>
diff --git a/lib/mappingapilite.jar b/lib/mappingapilite.jar
index bee7123aa96e96a56e4e23f9c3ae5e58da19c967..fc5d6b400526bf1317ce55c67236a9edee07af25 100644
GIT binary patch
delta 5525
zcmZWt2|SeB`=2vo8~d)Y?^=*72_X@(46+WT>|0`P<&tbg6jDv@8x;vr)(j!!Qgl;9
zNLM9G+Q?GUqV#_^F2BFe2hV(;=lMS0bKdiw^PK5#Vy$Un<+Zmav2YTQpVv+s_0ICD
zu#Ca~Z|cngmVL0nP$!zB1~ZcQf{0metRk$KMdzF%3Ls(BgNlx}Bm%*Thd?l92#9Tj
z&KLqAW)+Vs35(<r7{;?_h4^rcMQj1fE&@rlA6N*47A^w86wcnpv={%uf+bRA{Mk^8
zQKvMI*7921a^I6kAp8Mm=%BT(Yy)KGSLHyAP08ZtI}HGj2maMY{LI{S+W{GosX3)E
zm(2JbqRZe@=Vq#HxJu+j;4Y1qA-XW*Zx+V%0Zk^Kx+AXDUn2q6I-ymLO$hU{P6HW}
zw%d3J7inZBz>aFuRas2)hUeiB8-ZYe*3PhwCJ7)@TEBy4HqTBVY!tz#h+$<X5x4mk
zGbC!PpliH<Ued1TyR+-5a&?fTmE-`K_>lM3*ge~zXO<p*z5Q1G<=*UT#{=s-Vj8xs
zV+k%lCLvB9=)P_5KKMuG!kw^1_I>^}RfT~H4@cOIJwEex9{t=I9rni1aG}CNhSZ%D
z_k%y--xU7>#e$f=AvrmPmeF!G`3)m+X?%jpW;RtHXygjP*<f;o0KJGWWX9d4(fZzm
zVq=cT(BGr!s#E^-j1=9QgBPP_M9E>}^P%Z=Vqwq>uXLkhYeQX(E+f)TXejk7efrnd
zuYfG`dfrstNY$$&nb)S$n9&xaYScQanwnAdZB6O|?dYX8lB!Y5C?hS3dao$%=(FQ?
zx+5kwx+7ZOR8t?H{I+%CXhNH*{GE4qV?7zsvr1E)mXQ~pf42RmDeZNct5IH0APRiB
zef>G{2-~i##B)|u#q$NC1I`|HS*P-{PnKqPpYMCn>;8y(Z8STtIA{;$l(b=A$UCyu
z^{j}D_{@bh<L2OS!s$(|lM1%LfD}h6>esqK%IDVOH_X)9KRl6}78EoeL_U*tUOZz<
zDG?<9RjB0L`_xBhaHo=viSV<UD$95|UmfW`{eNiR<qzLlSsH&eSikJz$&u2$FNd6F
z9}Ejm*FX8ke3Cosh}oM>2ZLUFb%t-5f8n&_ePy--BfHG6)ZK09d$TX?`0v^5`MBnD
zK5Ea{Lkv8uN#DIGwly`a*Mq2m^R04Kw^^#A>)x-m@e6%vZ?0{$IPU+F=#ok0e{{g^
zf>M2E3;$%WIA2yohow?igcRj8hnrCNzZbI0x^3+0ch%-AdMNo5pGKdhY;aWwNKe!{
z*WvGd{y{WJ>R}0=x{V?=QM_!&m7MXoLO(LEmakQQ@Cjc~^DHcdvX0R`AmW;@txX}N
zbVRQ6G(YuncfIdXR;E+og{1f{$6J?&O4bSq2{lCeiwQ|exr`2MST_*k<yzObR#Up|
zQhYd%Ur^pP@;h<E!tZJUJU?$xzCP!rH>XyF{AHX~v%fj3>X(X6bCwRbzpZ3NLtJD3
zXm~P9_1TN6j`Ue_v_taxk37(x&#e2$ZyM*nJln73{-VM?_73q-|4d1$RRc5;&!?Zf
z=uFvr*XLncbDZYo9@U35dPcWc^DW=BVUE;Iq82nsp~`^z{i*$DD8}kz{*q$hemysn
z_fl$y>r$d9cEb~gjN5g7D4X}IO!39}s&(%5j0rSR^KcxK()3L5fObu*I~XT;_#GwL
zo%(hyt>{Weq_|y2ik$jB>l!UNQ=iKvqKv>ZU85uC4?MZ-_(#t3{rZpFCTF%ZyxP92
zT}w5m?V#qJbQ<N=$k3lzkG{^tP#zzgW`D6D7i&g7>|x&1$$dGu+JD`kujcqQMoyfK
zL<i`9;*$#Hrpb({$j7c93;0%_viF~FO0h~~1D2d_(T$(BpPiNX>C!$u6AdIbF3xXr
z(H(U+Z<m>|pv1N2vX*uSDJ>p*YxdK*{ndq^uQsWU$)s>{sM%I4S}WezMH-}Z))i0Q
zzE@XVCZFkZTsSM!#Ye0;dwtkP!G|%w<Ju&WAMH4@Nu<1KKKQZfTXpYWQ5(G>DEGHa
z!xP~`3)Uq5;@eS8%2M9_F-hez6sgm5={YH8e0*~j3+xur77C`viHR5Ai;v{n>Avqu
zupYVDy4~=aL3p(7skt-PE=5f3zt8%z^^dEQQ|eMrYUTH)1oVoy<~A4<>=O|wxYxQf
z?)8+(%kJBpZ+ky_3apLWIdeorr$J2T`b4jCXlFI&M0NhHx4|Qyq#e^s&CSaao>(~T
z?a&Aui-gwlS490$A(R$eq)FU-o?`JLN;CBOr9zP{h3?1Ao_!D99_<>YPl}zK6T5rm
zV&%1h1~a0H)fLsno?Rb<TyH6RPj7qOJv_`2NB=t5lzIMU_D<IN-jWC>oBGT&ZY2Zf
z3xbtpqU+}pJF~0hxwKwiEY(SM2|k=1KPljm{?aHrk25Lc9lLL0Y;>>tr;<}gB#P}a
zRL>pP9z3D{0hG0DO}r8gHXKtstk=ixA@1(-M%IXX%hNft7S8+L#<V_%27@`_do#Um
zI_z;ljfI=|UXA6cbZaNocom&Jo)<3tsk)@{ln7^F@_R?S3xYA8r@h2#kK4Q2KQ~|7
z=@`g+;!Tgu(NlzyCSb1dfw-T3vMlRv_N=|MtJ(1pN%vMQ>CG0qFCGxL?wgYB3Mm?%
zD0pKuFrpt}X>#bmjj+&Xif?WXaRoivaa&aWS5MqA^`!In**0FvSMO3UEim2}QXDTd
z-x^f**e74CW0RQD>+-gKXZufqWr=I{as*1G>s@gP(7XHD?fK4J+b^G=-80!=UR|h?
z8S;E;YP|i}Lc46}{Y<UXU)3g?TIc?{aV@mp=6(Hm_Edx|=`G#)7wJH?YXdtoWxV3V
z;j8*jb;RPlLd#Bku_``rn%+)7{ry<Rl^D_IERX7Fho3kGL}&3Dvh1N6?51Aiih6oa
zI6}DBr|8ckfzD+lYqwV?5+8<LerPwk=1q^2@1LBvOGf^j9Z0&A-MwjOyONR_`$ytn
zs`Kk=m7#gT#^)g|&pq#HojFvKYeKroCY^2iIZ}Eg!CoVdUBA+{Z}O@#yPx<Mhn%L(
z$?69hu0NtL9Fy$V4BmU;?%{iHend?^7&$?k6yfK2d~E%kaBJVc7CGBlzRUlpn20d=
z(nck<yxj6@`mL#6V<hjwNz>^l$$#=H#+3#2<{pm@b5`b>_MW-wl;tUyokvjGZ!Ym*
zfzHdPU&HYm*jsaB%@+p&X+xL^t~GdLrN1X1w?@2kS<og$evv(09&ULW$c&yI3PVGH
z!u&g6Gv0vw2ziUQEaL|R@s?$Q?t?W%>%Fgv1;d#saG!@ZXUv>K$yg#|U6cdX%)~~m
z#kp?8T*0}h@eppkKbDPK$w_DMIEhpCI2M*h!<(Z=>CQN&bjAj^4xd|#d-E8)ENGj=
z%SyZ72DeBj`3VF^tc9}#Tnvp|E+~Tv1el^19%D@(^L-8-FXx$0!wDM-Jur(QUTlM@
z4=&EeYjE7Sgj>ZWOO|C>8sI=?_yv8Toxxva1o1fnHl}Qa9o81o*r<QQon)0Ef(tVr
zR2t(H+*J^66)~fTXbb7}fja<=W&ExsGsA9K;Q>vxU4X?KuEEHt-+~&<hxH3Y%<5=l
z!>ztM+c+?6&3$2Z%+ly$kTC0hj{zRX)~AipF^&4a<Cej|5i%B6KU~klixiWy|4=Fi
z_qlBVUKEPZei|S{-88_*Y@FJFXH85W#yInRKj8%fzrVwsP74Mc0$wl?dIP}!C_-Lj
zpt5G^X23x}0^(koB(7&A5Jb5c;TjYu+!e6b{w4tjRu;rt>qG{daq~1UkmVIX)U6~{
zfFH9ABqIgbCH^Bug7_lTn<ru7Sh)G$gap;XL0oL;Kp}MnFos%;cR&@*hNzx^9kNpd
z*fiF9D1ulK7Ub>%z0?D`=<TI;jXp@ho(oi909?>D0xcQ<f6NNp3cN6@b1OKES>}cy
z2(y@mAQZC{jes9!r5k|=%wjiQ@<tjj@r@dTaLntn4eZ6N`fb1yvm{KwLCiX50s=8>
z(PT-1&-Nw0zU?3c^O~9hI%d_Gf&k1?Fav%(tL_m{rWx2Li!5t5In7gE@DzIU5eWJ#
zCcPlR(Un2xQD-!{^77kT1EMeqx$0rN4dk^0h!eT@AOTRx4j_%y=|oVbH<~8p!>{_k
zY5#3Q1j6Q3wOj(wq`w0=p;U9gjlL}uiqg+SNY(_15Fdr0m3CVIZfMpVNTJFT<9PaS
z!#A(%90Y>VDz@4KOX0Y%SPNKKCmluqvB2|JZEdUawGW|cat;Zt7y<#^XII1#beBKy
z6F!<OL^4_+J*dPIaAUL4U<t&5Jw&$z`Vjw4pooetPcs!(hegZ4w>h`vd;*~$;b;t!
z&(JtdX8ed*18uZg;<>XE7B3sW?9GW6TH!Ueg1rsLaIe$~PYdFqC83_KB;geveQVhB
z@g(AbGOWP{Oz#~8HAzF`Z>8~}@u=qWpT6CF18)==@G@~;r8y@Z>ahXFP`V91JYo6Y
z<wJ028XW4hD)egx66%c-io7;C`Zw%d4@Xj0MOmCfMWxvS1vE13t&jFK_)csDuf5fg
z2N`gr0mMlKa+v&$R9Joz1f$N-73$LDRU&9Z4vd;X{B}T423hmjv@dC2;M&!&N~=}%
zH6Rl^K*I=g?BLY&LR8RaJ0Ob+S`kgqT>gMO|H&doLZ$YK1%tgR-3q_eb>LbT;X~AV
zIRSa#TZ@qdXqyAzWZWv|gNE&wM9<j6l?Sgcx#dvNb-sQ>1~5?uOk}Z&=m-?=u(VMP
zI>4#oWpJuKq_GQ#VMDRr1*1305tJcY!3$OFS}N6ycy?669!scc2jE7Jx=fwV8zH-0
zK$JLi6A{6nRtZA}a1QoNGQ7`-!b>;<K7@C!5)#G4qsf0c0dcIfG;9&)YfuM#>M_D@
zas5Z7M0@o@3m#J@Jf_uD8MSzZ7$S=kA~^$D;<|b$j|3!FY)A0Eh3wuA&TtX0dT7KQ
z$U^DP@ZeDRG6G-5;eVZh0t)}-0;882vEZ#PKn)8HMc`|9mSGB1;SL045hBK&*Ig~}
zXd{IQgp~(VLBfZ2G@fC8Ujo|bx>VQL6{aF~VJ^=u1t@3PRgSo_dX`**&`(#q$iKpU
zx*y=_d<xHp#;R$3){BXvy1^SQI<Rmzn1#O|gG=4OdJG;!V4eXC7Nr4E4A!8*aOyAy
z!^gY?2B#vh<<v5ap8mLR8u2wvW4;aUKov{zaEIZ|pO)b@=p4x)n*6gji{-)6+u)U<
zwo1M}H0%zxVg#}tFoE&{LZAZqcmP4U|JOh)=OQna9|<s8l!eij0fJiwPN=~Ho@FEn
zdI)ooivA}+3X<Ku6riyi4p1hqV0gS6a6u=@Kv-?%(S)$+i`mn9;4dIUCEzaxmn9&t
z=|0}o1S;4_ejwzDk^pLv1j>-%9>9s=)_Y*Q4Z{_oH24#S-#~DJ0vfLfP3&2ElvD#4
uf4hXk4T^vqGM%w(;!=w6w|z~f|9iNpDdHTb6@diQ><ReU%JkrgC;T5rq{EH?
delta 5554
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
PJWs%}sZ#@<cEbMv=JP*j
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index dc5708d3..38221d83 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2003-2008
+ * Copyright (C) INRIA, 2003-2008
* Copyright (C) CNR Pisa, 2005
*
* This program is free software; you can redistribute it and/or modify
@@ -102,6 +102,10 @@ public class BasicAlignment implements Alignment {
* object.
*/
public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException {
+ init( onto1, onto2 );
+ }
+
+ public void init( Object onto1, Object onto2 ) throws AlignmentException {
if ( onto1 instanceof Ontology ) {
this.onto1 = (Ontology<Object>)onto1; // [W:unchecked]
this.onto2 = (Ontology<Object>)onto2; // [W:unchecked]
@@ -111,10 +115,6 @@ public class BasicAlignment implements Alignment {
}
}
- public void init( Object onto1, Object onto2 ) throws AlignmentException {
- init( onto1, onto2, null );
- }
-
public static Parameters getParameters() {
return (Parameters)null;
}
diff --git a/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java b/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java
index 87304751..f9836f39 100644
--- a/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2003-2008
+ * Copyright (C) INRIA, 2003-2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
index d15989eb..d7b7187f 100644
--- a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2003-2008
+ * Copyright (C) INRIA, 2003-2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/org/semanticweb/owl/align/Alignment.java b/src/org/semanticweb/owl/align/Alignment.java
index 3d0f7889..cf7b83dd 100644
--- a/src/org/semanticweb/owl/align/Alignment.java
+++ b/src/org/semanticweb/owl/align/Alignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2003-2005, 2007-2008
+ * Copyright (C) INRIA, 2003-2005, 2007-2008
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -43,6 +43,13 @@ public interface Alignment extends Cloneable, Iterable<Cell> {
public void init( Object onto1, Object onto2 ) throws AlignmentException;
+ /**
+ * Initialize the alignement before using it, with some ontology caching trick
+ * //@deprecated The OntologyCache is now internal, use init( onto1, onto2 ) instead
+ **/
+ //@Deprecated
+ public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException;
+
/** Alignment methods **/
public void accept( AlignmentVisitor visitor ) throws AlignmentException;
--
GitLab