[jboss-svn-commits] JBoss Common SVN: r4318 - in arquillian/trunk: impl-base/src/main/java/org/jboss/arquillian/impl/handler and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 22 06:10:18 EDT 2010
Author: aslak
Date: 2010-04-22 06:10:17 -0400 (Thu, 22 Apr 2010)
New Revision: 4318
Modified:
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansConfiguration.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java
arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
Log:
ARQ-101 Removed @Override for 1.5 compliance
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansConfiguration.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansConfiguration.java 2010-04-22 09:30:00 UTC (rev 4317)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansConfiguration.java 2010-04-22 10:10:17 UTC (rev 4318)
@@ -30,7 +30,6 @@
/* (non-Javadoc)
* @see org.jboss.arquillian.spi.ContainerConfiguration#getContainerProfile()
*/
- @Override
public ContainerProfile getContainerProfile()
{
return ContainerProfile.STANDALONE;
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java 2010-04-22 09:30:00 UTC (rev 4317)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/OpenWebBeansSEContainer.java 2010-04-22 10:10:17 UTC (rev 4318)
@@ -73,7 +73,6 @@
/* (non-Javadoc)
* @see org.jboss.arquillian.spi.DeployableContainer#setup(org.jboss.arquillian.spi.Configuration)
*/
- @Override
public void setup(Configuration configuration)
{
}
@@ -81,7 +80,6 @@
/**
* @see org.jboss.arquillian.spi.DeployableContainer#start()
*/
- @Override
public void start() throws LifecycleException
{
}
@@ -89,7 +87,6 @@
/**
* @see org.jboss.arquillian.spi.DeployableContainer#stop()
*/
- @Override
public void stop() throws LifecycleException
{
}
@@ -97,7 +94,6 @@
/**
* @see org.jboss.arquillian.spi.DeployableContainer#deploy(org.jboss.shrinkwrap.api.Archive)
*/
- @Override
public ContainerMethodExecutor deploy(final Archive<?> archive)
throws DeploymentException
{
@@ -162,7 +158,6 @@
/**
* @see org.jboss.arquillian.spi.DeployableContainer#undeploy(org.jboss.shrinkwrap.api.Archive)
*/
- @Override
public void undeploy(Archive<?> archive) throws DeploymentException
{
ContainerInstanceHolder holder = CONTAINER_INSTANCE_HOLDER.get();
@@ -223,73 +218,61 @@
attributes = new HashMap<String, Object>();
}
- @Override
public long getCreationTime()
{
return creationTime;
}
- @Override
public String getId()
{
return id;
}
- @Override
public long getLastAccessedTime()
{
return creationTime;
}
- @Override
public ServletContext getServletContext()
{
throw new UnsupportedOperationException("Not supported.");
}
- @Override
public void setMaxInactiveInterval(int i)
{
this.maxInactiveInterval = i;
}
- @Override
public int getMaxInactiveInterval()
{
return maxInactiveInterval;
}
- @Override
public HttpSessionContext getSessionContext()
{
throw new UnsupportedOperationException("Not supported.");
}
- @Override
public Object getAttribute(String string)
{
return attributes.get(string);
}
- @Override
public Object getValue(String string)
{
return getAttribute(string);
}
- @Override
public Enumeration getAttributeNames()
{
final Iterator<String> nameIt = attributes.keySet().iterator();
return new Enumeration() {
- @Override
public boolean hasMoreElements()
{
return nameIt.hasNext();
}
- @Override
public Object nextElement()
{
return nameIt.next();
@@ -297,47 +280,39 @@
};
}
- @Override
public String[] getValueNames()
{
return attributes.keySet().toArray(new String[0]);
}
- @Override
public void setAttribute(String string, Object value)
{
attributes.put(string, value);
}
- @Override
public void putValue(String string, Object value)
{
setAttribute(string, value);
}
- @Override
public void removeAttribute(String string)
{
attributes.remove(string);
}
- @Override
public void removeValue(String string)
{
removeAttribute(string);
}
- @Override
public void invalidate()
{
attributes.clear();
}
- @Override
public boolean isNew()
{
return true;
}
-
}
}
Modified: arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java
===================================================================
--- arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java 2010-04-22 09:30:00 UTC (rev 4317)
+++ arquillian/trunk/containers/openwebbeans-embedded/src/main/java/org/jboss/arquillian/openwebbeans/ShrinkWrapClassLoader.java 2010-04-22 10:10:17 UTC (rev 4318)
@@ -102,13 +102,11 @@
final Iterator<URL> i = it;
return new Enumeration<URL>()
{
- @Override
public boolean hasMoreElements()
{
return i.hasNext();
}
- @Override
public URL nextElement()
{
return i.next();
Modified: arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java
===================================================================
--- arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-04-22 09:30:00 UTC (rev 4317)
+++ arquillian/trunk/impl-base/src/main/java/org/jboss/arquillian/impl/handler/ActivateRunModeTypeLocal.java 2010-04-22 10:10:17 UTC (rev 4318)
@@ -38,8 +38,9 @@
*/
public class ActivateRunModeTypeLocal implements EventHandler<ClassContext, BeforeClass>
{
-
- @Override
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.impl.event.EventHandler#callback(java.lang.Object, java.lang.Object)
+ */
public void callback(ClassContext context, BeforeClass event)
throws Exception
{
@@ -56,7 +57,9 @@
// TODO: this is a copy of the protocol-local Executor. Move to SPI and remove protocol local?
private static class LocalMethodExecutor implements ContainerMethodExecutor
{
- @Override
+ /* (non-Javadoc)
+ * @see org.jboss.arquillian.spi.ContainerMethodExecutor#invoke(org.jboss.arquillian.spi.TestMethodExecutor)
+ */
public TestResult invoke(TestMethodExecutor testMethodExecutor)
{
try
@@ -67,10 +70,8 @@
{
private static final long serialVersionUID = 1L;
- @Override
public Throwable getThrowable() { return null; }
- @Override
public Status getStatus() { return Status.PASSED; }
};
}
@@ -80,13 +81,11 @@
{
private static final long serialVersionUID = 1L;
- @Override
public Status getStatus() {return Status.FAILED; }
- @Override
public Throwable getThrowable() {return e;}
};
}
}
}
-}
+}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list