polishing buttons and fixing source names pattern in advanced discoverer / composer

Author: jlcanovas

jsondiscoverer.web/WebContent/app/partials/advanced.html

@@ -43,7 +43,7 @@ <h4 style="padding-top: 20px;">Step 2. Discover and Compose </h4>
 				<a style="text-decoration: none;" ng-href="{{metamodelFile}}" target="_blank">
 					<button style="margin-top: 10px;" class="btn btn-block" type="button" ng-disabled="metamodelFile == ''"
 					data-intro="We work with Eclipse Modeling Framework (EMF) so if you want you can download the schema as an Ecore file" data-position="bottom">
-						Download schema <small>(Save as Ecore)</small>
+						Download Schema <small>(Save as Ecore)</small>
 					</button> 
 				</a>
 		    </div>

jsondiscoverer.web/WebContent/app/partials/simple.html

@@ -64,14 +64,14 @@ <h3>Your JSON document</h3>
 				<a style="text-decoration: none;" ng-href="{{metamodelFile}}" target="_blank">
 					<button style="margin-top: 20px;" class="btn btn-block" type="button" ng-disabled="metamodelFile == ''"
 					data-intro="We work with Eclipse Modeling Framework (EMF) so if you want you can download the schema as an Ecore file" data-position="left">
-						Download schema<br>
+						Download Schema<br>
 						<small>(Save as Ecore)</small>
 					</button>
 				</a>
 				<a style="text-decoration: none;" ng-href="{{modelFile}}" target="_blank">
 					<button style="margin-top: 10px;" class="btn btn-block" type="button" ng-disabled="modelFile == ''"
 					data-intro="You can also download the data model as an XMI file (conforming to the previous Ecore model)" data-position="bottom">
-						Download data<br>
+						Download Data<br>
 						<small>(Save as XMI)</small>
 					</button>
 				</a>

jsondiscoverer.web/src/jsondiscoverer/web/JsonAdvancedDiscovererServlet.java

@@ -58,7 +58,7 @@ public class JsonAdvancedDiscovererServlet extends AbstractJsonDiscoverer {
 	/** This pattern is used to analyze the params
 	  * The format is sources[JSON_SOURCE_NAME][SOMETHING]([])?
 	  * The important part is the JSON_SOURCE_NAME which provides the name of the parameter */
-	private static String paramsPattern = Pattern.quote("sources[") + "([a-zA-Z]*)"+ Pattern.quote("][") + "[\\$a-zA-Z]*" + Pattern.quote("]") + "(" + Pattern.quote("[]") + ")?";
+	private static String paramsPattern = Pattern.quote("sources[") + "([a-zA-Z0-9]*)"+ Pattern.quote("][") + "[\\$a-zA-Z]*" + Pattern.quote("]") + "(" + Pattern.quote("[]") + ")?";
 
 	@Override
 	public void init() throws ServletException {

jsondiscoverer.web/src/jsondiscoverer/web/JsonComposerServlet.java

@@ -49,7 +49,7 @@ public class JsonComposerServlet extends AbstractJsonDiscoverer {
 	/** This pattern is used to analyze the params
 	  * The format is sources[JSON_SOURCE_NAME][SOMETHING]([])?([input|output])?
 	  * The important part is the JSON_SOURCE_NAME which provides the name of the parameter */
-	private static String paramsPattern = Pattern.quote("sources[") + "([a-zA-Z]*)"+ Pattern.quote("]") + 
+	private static String paramsPattern = Pattern.quote("sources[") + "([a-zA-Z0-9]*)"+ Pattern.quote("]") + 
 			Pattern.quote("[") + "[\\$a-zA-Z]*" + Pattern.quote("]") + 
 			"(" + Pattern.quote("[") + "[0-9]*" + Pattern.quote("]") + ")?" + 
 			"(" + Pattern.quote("[") + "[a-zA-Z]*" + Pattern.quote("]") + ")?";