[jbossws-commits] JBossWS SVN: r10846 - in spi/branches/ropalka/src/main/java/org/jboss/wsf/spi: invocation and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-10-07 04:46:05 -0400 (Wed, 07 Oct 2009)
New Revision: 10846

Modified:
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java
   spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
Log:
[JBWS-2674][JBWS-2754] refactoring (WIP)

Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java	2009-10-07 08:45:23 UTC (rev 10845)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java	2009-10-07 08:46:05 UTC (rev 10846)
@@ -34,7 +34,8 @@
  */
 public abstract class AbstractExtensible implements Extensible
 {
-   private Map<Class, Object> attachments = new HashMap<Class, Object>();
+
+   private Map<Class<?>, Object> attachments = new HashMap<Class<?>, Object>();
    private Map<String, Object> properties = new HashMap<String, Object>();
    
    public Collection<Object> getAttachments()
@@ -81,4 +82,5 @@
    {
       properties.putAll(props);
    }
+
 }

Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java	2009-10-07 08:45:23 UTC (rev 10845)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/invocation/InvocationContext.java	2009-10-07 08:46:05 UTC (rev 10846)
@@ -21,8 +21,7 @@
  */
 package org.jboss.wsf.spi.invocation;
 
-import java.util.Map;
-import java.util.HashMap;
+import org.jboss.wsf.spi.deployment.AbstractExtensible;
 
 /**
  * A basic invocation context.
@@ -30,10 +29,10 @@
  * @author Thomas.Diesler at jboss.com
  * @since 20-Apr-2007
  */
-public class InvocationContext 
+public class InvocationContext extends AbstractExtensible
 {
+   
    private Object targetBean;
-   private Map<Class, Object> attachments = new HashMap<Class, Object>();
 
    public Object getTargetBean()
    {
@@ -45,19 +44,4 @@
       this.targetBean = targetBean;
    }
 
-
-   public <T> T addAttachment(Class<T> key, Object value)
-   {
-      return (T)attachments.put(key, value);
-   }
-
-   public <T> T getAttachment(Class<T> key)
-   {
-      return (T)attachments.get(key);
-   }
-
-   public <T> T removeAttachment(Class<T> key)
-   {
-      return (T)attachments.get(key);
-   }
 }