Author: simoneg
Date: Fri Oct 30 16:58:52 2009
New Revision: 831388
URL: http://svn.apache.org/viewvc?rev=831388&view=rev
Log:
LABS-494: Create much more HTML divs with classes
Modified:
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/templating/DefaultTemplate.java
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java
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=831388&r1=831387&r2=831388&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
Fri Oct 30 16:58:52 2009
@@ -22,6 +22,8 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
+import org.apache.magma.website.templating.Template;
import org.apache.magma.website.utils.MakeURLRewritingContextBased;
public aspect CompoundableProducerImpl {
@@ -122,44 +124,68 @@
prod.compounding = true;
List<Producer> list = prod.findCompoundedOn(CompoundType.HEAD);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.HEAD);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.BEFORE);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.BEFORE);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
proceed(orig, stream);
list = prod.findCompoundedOn(CompoundType.AFTER);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.AFTER);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.SIDEA);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.SIDEA);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.SIDEB);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.SIDEB);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.SIDEC);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.SIDEC);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.SIDED);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.SIDED);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
list = prod.findCompoundedOn(CompoundType.FOOT);
for (Producer producer : list) {
- if (producer instanceof HtmlProducer)
+ if (producer instanceof HtmlProducer) {
+ openWrapper((HtmlProducer) producer, stream,
CompoundType.FOOT);
((HtmlProducer)producer).produce(stream);
+ closeWrapper(stream);
+ }
}
prod.compounding = false;
}
@@ -211,4 +237,12 @@
prod.compounding = false;
}
+ protected void openWrapper(HtmlProducer prod, Writer out, CompoundType
type) throws IOException {
+ out.write("<div class=\"" +
Template.computeProducerClasses(prod) + type.name() + "\">");
+ }
+
+ protected void closeWrapper(Writer out) throws IOException {
+ out.write("</div>");
+ }
+
}
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/DefaultTemplate.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/DefaultTemplate.java?rev=831388&r1=831387&r2=831388&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/DefaultTemplate.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/DefaultTemplate.java
Fri Oct 30 16:58:52 2009
@@ -52,38 +52,5 @@
public void layoutFooter() {
}
-
- @Override
- protected void openWrapper(String zone, HtmlProducer producer,
OutputStreamWriter osw) throws IOException {
- String clazz = "";
- String generatedId = "";
- WebHandler handler = producer.getCreatingHandler();
- if (handler != null) {
- generatedId += handler.getClass().getSimpleName() + "-";
- clazz += handler.getClass().getSimpleName() + " ";
- }
- Method method = producer.getCreatingMethod();
- if (method != null) {
- generatedId += method.getName();
- } else if (handler != null) {
- generatedId = generatedId.substring(0,
generatedId.length() - 1);
- }
-
- if (zone.equals("Right") || zone.equals("Left")) clazz +=
"boxes ";
-
-
-
- osw.write("<div id=\"" + generatedId + "\" class=\"" + clazz +
"\">");
- osw.write("<div>");
- }
-
- @Override
- protected void closeWrapper(String zone, HtmlProducer producer,
OutputStreamWriter osw) throws IOException {
- osw.write("</div>");
- super.closeWrapper(zone, producer, osw);
- }
-
-
-
}
Modified:
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java?rev=831388&r1=831387&r2=831388&view=diff
==============================================================================
---
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java
(original)
+++
labs/magma/trunk/foundation-website/src/main/java/org/apache/magma/website/templating/Template.java
Fri Oct 30 16:58:52 2009
@@ -20,6 +20,7 @@
import org.apache.magma.website.CompoundType;
import org.apache.magma.website.Head;
import org.apache.magma.website.HtmlProducer;
+import org.apache.magma.website.Producer;
import org.apache.magma.website.RootWebHandler;
import org.apache.magma.website.WebHandler;
import org.apache.magma.website.utils.URLRewritingStream;
@@ -208,7 +209,7 @@
}
protected void openWrapper(String zone, HtmlProducer producer,
OutputStreamWriter osw) throws IOException {
- osw.write("<div id=\"" +
producer.getCreatingHandler().getClass().getSimpleName() + "-" +
producer.getCreatingMethod().getName() + "\" class=\"" +
producer.getCreatingHandler().getClass().getSimpleName() + "\">");
+ osw.write("<div class=\"" + computeProducerClasses(producer) +
" zonedElement\">");
}
protected TemplateData parseContent() {
@@ -233,4 +234,17 @@
this.forceMain = forceMain;
}
+ public static String computeProducerClasses(Producer prod) {
+ String classes = "";
+ WebHandler handler = prod.getCreatingHandler();
+ if (handler != null) {
+ classes += handler.getClass().getSimpleName() + " ";
+ }
+ Method method = prod.getCreatingMethod();
+ if (method != null) {
+ classes += method.getName() + " ";
+ }
+ return classes;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
