Author: simoneg
Date: Wed Jul 14 03:48:26 2010
New Revision: 963938
URL: http://svn.apache.org/viewvc?rev=963938&view=rev
Log:
Partially rolled back cause of a bug in AspectJ :(
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/HtmlProducer.java
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildren.java
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildrenImpl.aj
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java
Wed Jul 14 03:48:26 2010
@@ -18,7 +18,7 @@ package org.apache.magma.website;
import java.util.List;
-public interface CompoundableProducer extends ProducerWithChildren<Producer> {
+public interface CompoundableProducer {
public CompoundableProducer compoundWith(Producer other, CompoundType
type);
public CompoundableProducer compoundCssClass(String cssClass,
CompoundType type);
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj
Wed Jul 14 03:48:26 2010
@@ -55,7 +55,7 @@ public aspect CompoundableProducerImpl {
rel.type = t;
if (compound == null) compound = new
ArrayList<CompoundRelation>();
compound.add(rel);
- addChild(p);
+ //addChild(p);
return this;
}
@@ -74,7 +74,7 @@ public aspect CompoundableProducerImpl {
while (iter.hasNext()) {
CompoundRelation rel = iter.next();
if (rel.type == type) {
- removeChild(rel.prod);
+ //removeChild(rel.prod);
iter.remove();
}
}
@@ -82,7 +82,7 @@ public aspect CompoundableProducerImpl {
public void CompoundableProducer.removeCompounded(Producer producer) {
if (compound == null) return;
- removeChild(producer);
+ //removeChild(producer);
Iterator<CompoundRelation> iter = compound.iterator();
while (iter.hasNext()) {
CompoundRelation rel = iter.next();
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/HtmlProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/HtmlProducer.java?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/HtmlProducer.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/HtmlProducer.java
Wed Jul 14 03:48:26 2010
@@ -31,7 +31,7 @@ import java.util.List;
@LateConfigurable
-public abstract class HtmlProducer extends Producer implements Templatable,
CompoundableProducer {
+public abstract class HtmlProducer extends Producer implements Templatable,
CompoundableProducer, ProducerWithChildren {
protected boolean repeatable = true;
protected Template template;
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildren.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildren.java?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildren.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildren.java
Wed Jul 14 03:48:26 2010
@@ -2,10 +2,10 @@ package org.apache.magma.website;
import java.util.List;
-public interface ProducerWithChildren<T extends Producer> {
+public interface ProducerWithChildren {
- public List<T> getChildren();
- public void addChild(T child);
- public void removeChild(T child);
+ public List<Producer> getChildren();
+ public void addChild(Producer child);
+ public void removeChild(Producer child);
}
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildrenImpl.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildrenImpl.aj?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildrenImpl.aj
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/ProducerWithChildrenImpl.aj
Wed Jul 14 03:48:26 2010
@@ -6,19 +6,19 @@ import java.util.List;
public aspect ProducerWithChildrenImpl {
- private List<T> ProducerWithChildren<T>.producers = null;
+ private List<Producer> ProducerWithChildren.producers = null;
- public void ProducerWithChildren<T>.addChild(T child) {
- if (producers == null) producers = new ArrayList<T>();
+ public void ProducerWithChildren.addChild(Producer child) {
+ if (producers == null) producers = new ArrayList<Producer>();
producers.add(child);
}
- public void ProducerWithChildren<T>.removeChild(T child) {
+ public void ProducerWithChildren.removeChild(Producer child) {
if (producers == null) return;
producers.remove(child);
}
- public List<T> ProducerWithChildren<T>.getChildren() {
+ public List<Producer> ProducerWithChildren.getChildren() {
return producers == null ? Collections.EMPTY_LIST : producers;
}
Modified:
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java?rev=963938&r1=963937&r2=963938&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
(original)
+++
labs/magma/trunk/foundation-website/src/test/java/org/apache/magma/website/WebHandlerCycleTest.java
Wed Jul 14 03:48:26 2010
@@ -365,7 +365,7 @@ public class WebHandlerCycleTest {
Producer prod = disp.getUsedProducer();
assertTrue(prod instanceof HtmlProducer);
List<Producer> children = ((HtmlProducer)prod).getChildren();
- assertEquals(5, children.size());
+ //assertEquals(5, children.size());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
