labs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simo...@apache.org
Subject svn commit: r740988 - in /labs/magma/trunk: magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/ maps-google/src/main/java/org/apache/magma/maps/google/ maven-magma-plugin/src/test/java/ website-administration/src/mai...
Date Thu, 05 Feb 2009 03:25:24 GMT
Author: simoneg
Date: Thu Feb  5 03:25:24 2009
New Revision: 740988

URL: http://svn.apache.org/viewvc?rev=740988&view=rev
Log:
LABS-252 : no more dash, but semicolon 

Added:
    labs/magma/trunk/maven-magma-plugin/src/test/java/
Modified:
    labs/magma/trunk/magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/_default.vm
    labs/magma/trunk/maps-google/src/main/java/org/apache/magma/maps/google/AddMapLink.aj
    labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminAction.java
    labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
    labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java
    labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/i18n/plainout.vm
    labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
    labs/magma/trunk/website-jobs/src/main/resources/org/apache/magma/website/jobs/list.vm

Modified: labs/magma/trunk/magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/_default.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/_default.vm?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/_default.vm
(original)
+++ labs/magma/trunk/magma-webcomponent-archetype/src/main/resources/archetype-resources/src/main/resources/_default.vm
Thu Feb  5 03:25:24 2009
@@ -1,3 +1,3 @@
 <h1>Your first web handler</h1>
 <p>Hello, this is your first web handler serving a Velocity template.</p>
-<p>See also the <a href="count-10">count example</a> to take a look at
how parameters work.</p>
\ No newline at end of file
+<p>See also the <a href="count;10">count example</a> to take a look at
how parameters work.</p>
\ No newline at end of file

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=740988&r1=740987&r2=740988&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
Thu Feb  5 03:25:24 2009
@@ -14,11 +14,11 @@
 		args(stream) && within(SmartListProducer) && this(prod) {
 		try {
 			if (prod instanceof MappedSmartListProducer) {
-				stream.write("<a href=\"useMap-false\" class=\"MagmaGoogleMapsToListLink\">".getBytes("UTF-8"));
+				stream.write("<a href=\"useMap;false\" class=\"MagmaGoogleMapsToListLink\">".getBytes("UTF-8"));
 				stream.write(new LocalizableString("Back to normal list").toString().getBytes("UTF-8"));
 				stream.write("</a>".getBytes("UTF-8"));							
 			} else if (prod.mappable) {
-				stream.write("<a href=\"useMap-true\" class=\"MagmaGoogleMapsToMapLink\">".getBytes("UTF-8"));
+				stream.write("<a href=\"useMap;true\" class=\"MagmaGoogleMapsToMapLink\">".getBytes("UTF-8"));
 				stream.write(new LocalizableString("Show on map").toString().getBytes("UTF-8"));
 				stream.write("</a>".getBytes("UTF-8"));							
 			}

Modified: labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminAction.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminAction.java?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminAction.java
(original)
+++ labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AdminAction.java
Thu Feb  5 03:25:24 2009
@@ -34,7 +34,7 @@
 		if (bean == null || !parametrized) return getUrl();
 		Converter conv = Converters.getConverterFor(bean.getClass());
 		if (conv == null) throw new MagmaException("Cannot find a converter for {0}", bean.getClass());
-		return getUrl() + "-" + conv.toString(bean); 
+		return getUrl() + ";" + conv.toString(bean); 
 	}
 	
 	@Override

Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
(original)
+++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
Thu Feb  5 03:25:24 2009
@@ -165,7 +165,7 @@
 	}
 
 	protected String createUrlFor(FieldNode fldn, MagmaBeanSupport bean) {
-		return this.linkUrl + "-" + this.converter.toString(bean);
+		return this.linkUrl + ";" + this.converter.toString(bean);
 	}
 
 	protected void openRow(Object o, Writer tables) throws IOException {

Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java
(original)
+++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java
Thu Feb  5 03:25:24 2009
@@ -119,7 +119,7 @@
 		ret.append("</div>");
 		ret.append("<div class=\"PaginationNavigation\">");
 		if (start > 0) {
-			ret.append(" <a class=\"PaginationPrevious\" href=\"start-" + Math.max(0, start - len)
+ "\">");
+			ret.append(" <a class=\"PaginationPrevious\" href=\"start;" + Math.max(0, start - len)
+ "\">");
 			ret.append(new LocalizableString("Previous page"));
 			ret.append("</a>");
 		}
@@ -131,7 +131,7 @@
 				ret.append(Integer.toString(currentpage + 1));
 				ret.append("</b> ");
 			} else {
-				ret.append(" <a href=\"start-" + Math.max(0, start + (len * po)) + "\">");
+				ret.append(" <a href=\"start;" + Math.max(0, start + (len * po)) + "\">");
 				ret.append(Integer.toString(currentpage + po + 1));
 				ret.append("</a> ");
 			}
@@ -140,7 +140,7 @@
 		ret.append("</span>");
 		
 		if (start + len < count) {
-			ret.append(" <a class=\"PaginationNext\" href=\"start-" + Math.max(0, start + len)
+ "\">");
+			ret.append(" <a class=\"PaginationNext\" href=\"start;" + Math.max(0, start + len)
+ "\">");
 			ret.append(new LocalizableString("Next page"));
 			ret.append("</a>");
 		}
@@ -156,15 +156,15 @@
 		if (sortables != null && (sortables != null && sortables.contains(fldn.getId())))
{
 			boolean sorted = this.sorting != null && this.sorting.equals(fldn.getId()); 
 			tables.write("<th class=\"MagmaList-HeaderCell " + fldn.getId() + " Sortable" + (sorted
? "Sorted" : "") + "\">");
-			String link = "sort-";
+			String link = "sort;";
 			if (sorted) {
 				if (desc) {
-					link += "false-";
+					link += "false;";
 				} else {
-					link += "true-";
+					link += "true;";
 				}
 			} else {
-				link += "false-";				
+				link += "false;";				
 			}
 			link += fldn.getId();
 			tables.write("<a href=\"" + link + "\">");

Modified: labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/i18n/plainout.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/i18n/plainout.vm?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/i18n/plainout.vm
(original)
+++ labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/i18n/plainout.vm
Thu Feb  5 03:25:24 2009
@@ -4,8 +4,8 @@
 </p>
 #if ($active) 
 <p>The function is currently active</p>
-<a href="plainout-false">Turn it OFF</a>
+<a href="plainout;false">Turn it OFF</a>
 #else
 <p>The function is currently not active</p>
-<a href="plainout-true">Turn it ON</a>
+<a href="plainout;true">Turn it ON</a>
 #end
\ No newline at end of file

Modified: labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
(original)
+++ labs/magma/trunk/website-developer/src/main/resources/org/apache/magma/website/developer/panel.vm
Thu Feb  5 03:25:24 2009
@@ -17,7 +17,7 @@
 -->
 <div>
 #if ($traceid > 0)
-	<b><a href="showTrace-$traceid">Show this page trace</a></b>
+	<b><a href="showTrace;$traceid">Show this page trace</a></b>
 #end
 <ul>
     <li><a href="settings">Settings</a></li>
@@ -26,7 +26,7 @@
 </ul>
 <b>I18n</b>
 <ul>
-    <li><a href="i18n/plainout-true">Toggle plain output</a></li>
+    <li><a href="i18n/plainout;true">Toggle plain output</a></li>
     <li><a href="i18n/sources">View i18n sources</a></li>
 </ul>
 </div>
\ No newline at end of file

Modified: labs/magma/trunk/website-jobs/src/main/resources/org/apache/magma/website/jobs/list.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-jobs/src/main/resources/org/apache/magma/website/jobs/list.vm?rev=740988&r1=740987&r2=740988&view=diff
==============================================================================
--- labs/magma/trunk/website-jobs/src/main/resources/org/apache/magma/website/jobs/list.vm
(original)
+++ labs/magma/trunk/website-jobs/src/main/resources/org/apache/magma/website/jobs/list.vm
Thu Feb  5 03:25:24 2009
@@ -55,7 +55,7 @@
   <tbody>
 #foreach ($state in $finished)
     <tr>
-      <td><a href="details-$state.id">$i18n.tr($state.lastRun,"short,short")</a></td>
+      <td><a href="details;$state.id">$i18n.tr($state.lastRun,"short,short")</a></td>
       <td>$state.name</td>
       <td>
       #if ($state.report.error) 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org


Mime
View raw message