[Mulgara-svn] r1641 - trunk/src/jar/resolver/java/org/mulgara/resolver

[pag at mulgara.org]

Author: pag
Date: 2009-03-26 12:59:54 -0700 (Thu, 26 Mar 2009)
New Revision: 1641

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/RemoveGraphOperation.java
Log:
fixed javadoc, removed unused import, suppressed warning on unused logger, and changed an iterator loop to a generics-based for-loop

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/RemoveGraphOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/RemoveGraphOperation.java	2009-03-26 19:58:50 UTC (rev 1640)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/RemoveGraphOperation.java	2009-03-26 19:59:54 UTC (rev 1641)
@@ -28,13 +28,10 @@
 package org.mulgara.resolver;
 
 // Java 2 standard packages
-import java.io.*;
 import java.net.URI;
-import java.util.*;
 
 // Third party packages
 import org.apache.log4j.Logger;
-import org.jrdf.graph.*;
 
 // Local packages
 import org.mulgara.query.*;
@@ -43,7 +40,7 @@
 import org.mulgara.store.nodepool.NodePool;
 
 /**
- * An {@link Operation} that implements the {@link Session#removeModel} method.
+ * An {@link Operation} that implements the {@link org.mulgara.server.Session#removeModel(URI)} method.
  *
  * @created 2004-11-24
  *
@@ -60,16 +57,12 @@
  *
  * @licence <a href="{@docRoot}/../../LICENCE">Mozilla Public License v1.1</a>
  */
-class RemoveGraphOperation implements Operation
-{
-  /**
-   * Logger.
-   *
-   * This is named after the class.
-   */
-  private static final Logger logger =
-    Logger.getLogger(RemoveGraphOperation.class.getName());
+class RemoveGraphOperation implements Operation {
 
+  /** Logger. */
+  @SuppressWarnings("unused")
+  private static final Logger logger = Logger.getLogger(RemoveGraphOperation.class.getName());
+
   /**
    * The URI of the model to be removed.
    */
@@ -104,16 +97,12 @@
 
   public void execute(OperationContext       operationContext,
                       SystemResolver         systemResolver,
-                      DatabaseMetadata       metadata) throws Exception
-  {
+                      DatabaseMetadata       metadata) throws Exception {
+
     long model = systemResolver.localize(new URIReferenceImpl(modelURI));
     model = operationContext.getCanonicalModel(model);
 
-    // Make sure security adapters are satisfied
-    for (Iterator i = operationContext.getSecurityAdapterList().iterator();
-         i.hasNext(); )
-    {
-      SecurityAdapter securityAdapter = (SecurityAdapter) i.next();
+    for (SecurityAdapter securityAdapter: operationContext.getSecurityAdapterList()) {
 
       // Lie to the user
       if (model == NodePool.NONE || !securityAdapter.canSeeModel(model, systemResolver)) {