Changeset 4233

Timestamp:

Apr 17, 2008, 3:05:50 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #436: Create extension system for the web application

Improved error handling.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (1 diff)
• clients/web/net/sf/basedb/clients/web/extensions/ExtensionsDirectory.java (modified) (2 diffs)
• clients/web/net/sf/basedb/clients/web/extensions/menu/PermissionMenuItemFactory.java (modified) (1 diff)
• core/net/sf/basedb/util/ClassUtil.java (modified) (2 diffs)
• core/net/sf/basedb/util/extensions/ExtensionsInvoker.java (modified) (3 diffs)
• core/net/sf/basedb/util/extensions/Registry.java (modified) (2 diffs)
• core/net/sf/basedb/util/extensions/xml/VariableConverter.java (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

@@ -216 +216 @@
   }
   
+  public static String getHomeUrl(String extensionId)
+  {
+    ExtensionsFile file = extensionsDir.getFileByExtensionId(extensionId);
+    return file == null ? null : extensionsDir.getResourcesUrl(file);
+  }
+  
   private final Set<Permission> permissions;
   private ExtensionsControl(Set<Permission> permissions)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsDirectory.java

@@ -584 +584 @@
     for (ExtensionsFile extFile : installedFiles.values())
     {
-      // Update the last modified information
-      extFile.resetModified();
-
       // Do not register extensions that has an error
       if (extFile.hasError()) continue;
@@ -610 +607 @@
     for (ExtensionsFile extFile : installedFiles.values())
     {
-      // Do not register extensions that has an error
-      if (extFile.hasError()) continue;
-
       try
       {
-        int num = extFile.registerExtensions(registry, forceUpdate);
-        results.addMessage(extFile, num + " extensions registered.");
-      }
-      catch (Throwable ex)
-      {
-        extFile.setError(true);
-        results.addErrorMessage(extFile, 
-          "Could not register extensions: " + ex.getMessage());
-        log.error("Could not register extensions from " + extFile.getName(), ex);
+        // Do not register extensions that has an error
+        if (extFile.hasError()) continue;
+  
+        try
+        {
+          int num = extFile.registerExtensions(registry, forceUpdate);
+          results.addMessage(extFile, num + " extensions registered.");
+        }
+        catch (Throwable ex)
+        {
+          extFile.setError(true);
+          results.addErrorMessage(extFile, 
+            "Could not register extensions: " + ex.getMessage());
+          log.error("Could not register extensions from " + extFile.getName(), ex);
+        }
+      }
+      finally
+      {
+        // Update the last modified information
+        extFile.resetModified();
       }
     }

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/menu/PermissionMenuItemFactory.java

@@ -129 +129 @@
   {
     SessionControl sc = context.getClientContext().getSessionControl();
-    boolean isEnabled = hasPermission(sc, visiblePermission);
-    return isEnabled && super.prepareContext(context);
+    boolean isVisible = hasPermission(sc, visiblePermission);
+    return isVisible && super.prepareContext(context);
   }
   // ------------------------------------

trunk/src/core/net/sf/basedb/util/ClassUtil.java

@@ -27 +27 @@
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.util.Set;
 import java.util.HashSet;
@@ -145 +146 @@
     return clazz;
   }
+  
+  /**
+    Find a method in a <code>clazz</code> with the given <code>name</code>
+    that takes the given list of <code>arguments</code>. This method is
+    just calling {@link Class#getMethod(String, Class...)} but returns
+    null instead of throwing an exception in case the method is not found.
+
+    @param clazz The class to look for the method in
+    @param name The name of the method
+    @param arguments The class types of the arguments
+    @return The method or null if not found
+    @since 2.7
+  */
+  public static Method findMethod(Class<?> clazz, String name, Class<?>... arguments)
+  {
+    Method m = null;
+    try
+    {
+      m = clazz.getMethod(name, arguments);
+    }
+    catch (NoSuchMethodException ex)
+    {}
+    return m;
+  }
 
 }

trunk/src/core/net/sf/basedb/util/extensions/ExtensionsInvoker.java

@@ -57 +57 @@
 {
 
+  private static final org.apache.log4j.Logger log = 
+    org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.ExtensionsInvoker");
+  
   final Collection<InvokationContext<A>> contexts;
   
@@ -90 +93 @@
     while (it.hasNext())
     {
-      A action = it.next();
-      Renderer<? super A> renderer = it.getRenderer();
-      if (renderer == null) 
+      A action = null;
+      Renderer<? super A> renderer = null;
+      try
       {
-        throw new NullPointerException("No renderer for extension: " + it.getExtension());
+        action = it.next();
+        renderer = it.getRenderer();
+        if (renderer == null) 
+        {
+          throw new NullPointerException("No renderer for extension: " + it.getExtension());
+        }
+        renderer.render(action);
       }
-      renderer.render(action);
+      catch (RuntimeException ex)
+      {
+        log.error("Could not render action '" + action + "' with renderer '" + 
+            renderer + "'", ex);
+      }
     }
   }
@@ -113 +126 @@
     while (it.hasNext())
     {
-      renderer.render(it.next());
+      A action = null;
+      try
+      {
+        action = it.next();
+        renderer.render(action);
+      }
+      catch (RuntimeException ex)
+      {
+        log.error("Could not render action '" + action + "' with renderer '" + 
+            renderer + "'", ex);
+      }
     }
   }

trunk/src/core/net/sf/basedb/util/extensions/Registry.java

@@ -151 +151 @@
       throw new InvalidUseOfNullException("extensionPoint.id of " + extensionPoint);
     }
-    Class<A> ac = extensionPoint.getActionClass();
-    if (ac == null) 
+    Class<A> actionClass = extensionPoint.getActionClass();
+    if (actionClass == null) 
     {
       throw new InvalidUseOfNullException("Action class of extensionPoint[id=" + id + "]");
     }
-    if (!Action.class.isAssignableFrom(ac))
-    {
-      throw new ClassCastException("Action class '" + ac.getName() + 
+    if (!Action.class.isAssignableFrom(actionClass))
+    {
+      throw new ClassCastException("Action class '" + actionClass.getName() + 
         "' of extensionPoint[id=" + id + "] doesn't implement the 'Action' class");
     }
@@ -254 +254 @@
       throw new InvalidUseOfNullException("extension.id of " + extension);
     }
-    if (extension.getActionFactory() == null) 
-    {
-      throw new InvalidUseOfNullException("Action factory of extension[id=" + id + "]");
+    ActionFactory<?> actionFactory = extension.getActionFactory();
+    if (actionFactory == null) 
+    {
+      throw new InvalidUseOfNullException("Action factory for extension '" + id + "' is null.");
     }
 

trunk/src/core/net/sf/basedb/util/extensions/xml/VariableConverter.java

@@ -90 +90 @@
       String variable = m.group(1);
       String value = variables.get(variable);
-      m.appendReplacement(sb, value == null ? m.group() : value);
+      if (value == null) value = m.group();
+      m.appendReplacement(sb, Matcher.quoteReplacement(value));
     }
     m.appendTail(sb);