svn commit: [jahia] r18329 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/containers/ContentContainerList.java

[sshyrkov]

Author: sshyrkov
Date: Fri Aug 31 15:48:11 2007
New Revision: 18329

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18329&repname=
=3Djahia
Log:
Cleanup: unused import statements, deprecated method call, ex.printStackTra=
ce() --> logger.error()

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/con=
tainers/ContentContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/containers/ContentContainerList.ja=
va&rev=3D18329&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/container=
s/ContentContainerList.java Fri Aug 31 15:48:11 2007
@@ -27,10 +27,8 @@
 import org.jahia.exceptions.JahiaException;
 import org.jahia.hibernate.manager.JahiaContainerListManager;
 import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.jahia.hibernate.manager.JahiaFieldsDataManager;
 import org.jahia.params.ProcessingContext;
 import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.metadata.CoreMetadataConstant;
 import org.jahia.services.pages.ContentPage;
 import org.jahia.services.usermanager.JahiaAdminUser;
 import org.jahia.services.usermanager.JahiaUser;
@@ -127,7 +125,9 @@
         try {
             return getParent(null,null,null).getSiteID();
         } catch (JahiaException e) {
-            e.printStackTrace();  //To change body of catch statement use =
Options | File Templates.
+            logger.error(
+                    "Unable to obtain site ID for the content container li=
st object with ID "
+                            + getID(), e);
         }
         return -1;
     }
@@ -162,10 +162,7 @@
      * @return
      */
     public ObjectKey getDefinitionKey (EntryLoadRequest loadRequest) {
-        int defID =3D getDefinitionID (loadRequest);
-        ContainerDefinitionKey ctnDefKey =3D (ContainerDefinitionKey)
-                ContainerDefinitionKey.getChildInstance (String.valueOf (d=
efID));
-        return ctnDefKey;
+        return new ContainerDefinitionKey(getDefinitionID(loadRequest));
     }
 =

     public SortedSet getEntryStates ()
@@ -443,8 +440,8 @@
          */
 =

        // retrieve the exact archive entry state
-       ContentObjectEntryState closestVersion =3D getClosestVersionedEntry=
State(entryState);
-       boolean markedForDelete =3D false;
+//       ContentObjectEntryState closestVersion =3D getClosestVersionedEnt=
ryState(entryState);
+//       boolean markedForDelete =3D false;
 =

        ArrayList locales =3D new ArrayList();
        locales.add(LanguageCodeConverters.languageCodeToLocale(entryState.=
getLanguageCode()));

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list