Changeset 6723

Timestamp:

10/01/06 09:12:15 (5 years ago)

Author:

sys

Message:

Rename IModuleFacet -> IFacet

Location:

trunk/Jav_BDP/com/scenari/m/bdp

Files:

• facet/IFacet.java (moved) (moved from trunk/Jav_BDP/com/scenari/m/bdp/facet/IModuleFacet.java) (1 diff)
• service/viewobject/HSDialogViewObject.java (modified) (2 diffs)
• source/WSourceBdpSpace.java (modified) (3 diffs)

trunk/Jav_BDP/com/scenari/m/bdp/facet/IFacet.java

@@ -49 +49 @@
  * 
  */
-public interface IModuleFacet extends IHModule{
+public interface IFacet extends IHModule{
         
         /** Nom du paramètre qui définit la facette à interroger (ie le code du module de l'itemType). */

trunk/Jav_BDP/com/scenari/m/bdp/service/viewobject/HSDialogViewObject.java

@@ -49 +49 @@
 
 import com.scenari.i.co.pages.IHPageResultatServlet;
-import com.scenari.m.bdp.facet.IModuleFacet;
+import com.scenari.m.bdp.facet.IFacet;
 import com.scenari.m.bdp.item.HItemDef;
 import com.scenari.m.bdp.item.HItemDefVersNet;
@@ -494 +494 @@
                                                         vQs = new HParamsQueryString(fQS);
                                                 }
-                                                if (vQs != null && vQs.hGetValue(IModuleFacet.PARAM_FACET) != null) {
+                                                if (vQs != null && vQs.hGetValue(IFacet.PARAM_FACET) != null) {
                                                         // On interroge une facette de l'item
                                                         IHItemType vItemType = fWorkspace.hGetItemType(vItemDef.hGetIdSs());
                                                         if (vItemType != null) {
-                                                                ISgnModule vSgnModule = vItemType.hGetSgnModule(vQs.hGetValue(IModuleFacet.PARAM_FACET), fIdSubItem != null ? fWorkspace.hGetItem(fSpace, fCodeItem, null).hGetSubItemSgn(fIdSubItem) : vItemDef.hGetSignature());
-                                                                if (vSgnModule != null && vSgnModule instanceof IModuleFacet) {
-                                                                        IModuleFacet vFacetModule = (IModuleFacet) vSgnModule;
+                                                                ISgnModule vSgnModule = vItemType.hGetSgnModule(vQs.hGetValue(IFacet.PARAM_FACET), fIdSubItem != null ? fWorkspace.hGetItem(fSpace, fCodeItem, null).hGetSubItemSgn(fIdSubItem) : vItemDef.hGetSignature());
+                                                                if (vSgnModule != null && vSgnModule instanceof IFacet) {
+                                                                        IFacet vFacetModule = (IFacet) vSgnModule;
                                                                         IHSource vSrc = vFacetModule.getFacet(vItemDef, fIdSubItem, vQs);
                                                                         if (vSrc != null && vSrc.hGetStatus() == IHSource.STATUS_FILE) {

trunk/Jav_BDP/com/scenari/m/bdp/source/WSourceBdpSpace.java

@@ -44 +44 @@
 import java.util.List;
 
-import com.scenari.m.bdp.facet.IModuleFacet;
+import com.scenari.m.bdp.facet.IFacet;
 import com.scenari.m.bdp.item.HItemDefVers;
 import com.scenari.m.bdp.item.IHItem;
@@ -133 +133 @@
                                         vQs = new HParamsQueryString(pName.substring(vOptsIdx+1));
                                 }
-                                String vFacet = vQs.hGetValue(IModuleFacet.PARAM_FACET);
+                                String vFacet = vQs.hGetValue(IFacet.PARAM_FACET);
                                 if(vFacet == null || vFacet.length()==0) {
                                         //Erreur de syntaxe => execption
@@ -141 +141 @@
                                 IHItem vItem = fWsp.hGetItem(fSpace, vCode, null);
                                 IHModule vModuleFacet = vItem.hGetItemType().hGetSgnModule(vFacet, (vIdSubItem!=null) ? vItem.hGetSubItemSgn(vIdSubItem) : vItem.hGetSignature());
-                                if(vModuleFacet != null && vModuleFacet instanceof IModuleFacet) {
-                                        IHSource vSrc = ((IModuleFacet)vModuleFacet).getFacet(vItem, vIdSubItem, vQs);
+                                if(vModuleFacet != null && vModuleFacet instanceof IFacet) {
+                                        IHSource vSrc = ((IFacet)vModuleFacet).getFacet(vItem, vIdSubItem, vQs);
                                         return new WSourceRelFrontEnd(vSrc, vSrc.hGetUri()).wInit(fStockSpace, this);
                                 }