Author: simoneg
Date: Tue Nov 17 22:55:05 2009
New Revision: 881595
URL: http://svn.apache.org/viewvc?rev=881595&view=rev
Log:
LABS-496: fixed map hooks missed during refactorings
Modified:
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/MappedSmartListProducer.java
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/UseMappedProducer.aj
Modified:
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj?rev=881595&r1=881594&r2=881595&view=diff
==============================================================================
---
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj
(original)
+++
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj
Tue Nov 17 22:55:05 2009
@@ -21,25 +21,28 @@
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.website.beansview.SmartListProducer;
+import org.apache.magma.website.utils.LinkHelper;
import org.apache.magma.website.WebHandler;
public aspect AddMapLink {
public boolean SmartListProducer.mappable = false;
+ private static LinkHelper lh = new LinkHelper("useMap", Boolean.class);
+
before(SmartListProducer prod, Writer stream) : execution(*
SmartListProducer.produce(..)) &&
args(stream) && within(SmartListProducer) && this(prod) {
try {
if (prod instanceof MappedSmartListProducer) {
- stream.write("<a href=\"useMap");
- stream.write(WebHandler.paramSeparator);
- stream.write("false\"
class=\"MagmaGoogleMapsToListLink\">");
+ stream.write("<a href=\"");
+ stream.write(lh.makeLink(false));
+ stream.write("\"
class=\"MagmaGoogleMapsToListLink\">");
stream.write(new LocalizableString("Back to
normal list").toString());
stream.write("</a>");
} else if (prod.mappable) {
- stream.write("<a href=\"useMap");
- stream.write(WebHandler.paramSeparator);
- stream.write("true\"
class=\"MagmaGoogleMapsToMapLink\">");
+ stream.write("<a href=\"");
+ stream.write(lh.makeLink(true));
+ stream.write("\"
class=\"MagmaGoogleMapsToMapLink\">");
stream.write(new LocalizableString("Show on
map").toString());
stream.write("</a>");
}
Modified:
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/MappedSmartListProducer.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/MappedSmartListProducer.java?rev=881595&r1=881594&r2=881595&view=diff
==============================================================================
---
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/MappedSmartListProducer.java
(original)
+++
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/MappedSmartListProducer.java
Tue Nov 17 22:55:05 2009
@@ -46,8 +46,8 @@
"</a>" +
"</div>";
- public <T extends MagmaBeanSupport> MappedSmartListProducer(Class<T>
myclass, Collection<? extends T> list) {
- super(myclass, list);
+ public <T extends MagmaBeanSupport> MappedSmartListProducer(Class<T>
myclass) {
+ super(myclass);
}
private static String[] markerLetters = null;
@@ -89,7 +89,7 @@
public void produce(Writer stream) throws IOException {
// We cannot use non-table cause javascript depends on data
inside the table
// we could solve this with HTML5 microtype informations
- this.listStyle = new ListStyleTable();
+ this.listStyle = new MappedListStyle();
stream.write("<div class=\"MagmaGoogleMapsList\">");
super.produce(stream);
sendPrototype(stream);
Modified:
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/UseMappedProducer.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/UseMappedProducer.aj?rev=881595&r1=881594&r2=881595&view=diff
==============================================================================
---
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/UseMappedProducer.aj
(original)
+++
labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/UseMappedProducer.aj
Tue Nov 17 22:55:05 2009
@@ -23,14 +23,14 @@
public aspect UseMappedProducer {
- SmartListProducer around(SmartList list, Class clzz, Collection coll) :
- call(SmartListProducer.new(Class, Collection))
+ SmartListProducer around(SmartList list, Class clzz) :
+ call(SmartListProducer.new(..))
&& this(list)
- && args(clzz, coll) {
+ && args(clzz) {
if (list.shouldMap()) {
- return new MappedSmartListProducer(clzz, coll);
+ return new MappedSmartListProducer(clzz);
} else {
- SmartListProducer prod = proceed(list, clzz, coll);
+ SmartListProducer prod = proceed(list, clzz);
prod.mappable = list.isMappable() && list.isMapped();
return prod;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
