Return-Path: 
 <commits-return-2074-apmail-labs-commits-archive=labs.apache.org@labs.apache.org>
Delivered-To: apmail-labs-commits-archive@minotaur.apache.org
Received: (qmail 53930 invoked from network); 10 Jul 2009 16:31:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 10 Jul 2009 16:31:21 -0000
Received: (qmail 77530 invoked by uid 500); 10 Jul 2009 16:31:31 -0000
Delivered-To: apmail-labs-commits-archive@labs.apache.org
Received: (qmail 77406 invoked by uid 500); 10 Jul 2009 16:31:30 -0000
Mailing-List: contact commits-help@labs.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@labs.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@labs.apache.org>
List-Post: <mailto:commits@labs.apache.org>
List-Id: <commits.labs.apache.org>
Reply-To: labs@labs.apache.org
Delivered-To: mailing list commits@labs.apache.org
Received: (qmail 77397 invoked by uid 99); 10 Jul 2009 16:31:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 16:31:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jul 2009 16:31:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6EF4B238889D; Fri, 10 Jul 2009 16:31:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r793023 -
 /labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
Date: Fri, 10 Jul 2009 16:31:08 -0000
To: commits@labs.apache.org
From: simoneg@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090710163108.6EF4B238889D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: simoneg
Date: Fri Jul 10 16:31:08 2009
New Revision: 793023

URL: http://svn.apache.org/viewvc?rev=793023&view=rev
Log:
LABS-352 : minor initial refactoring for introducing pieces.

Modified:
    labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java

Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java?rev=793023&r1=793022&r2=793023&view=diff
==============================================================================
--- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java (original)
+++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java Fri Jul 10 16:31:08 2009
@@ -74,7 +74,7 @@
 			if (actions != null) {
 				int i = 0;
 				for (FormAction action : this.actions) {
-					out.write("<input type=\"submit\" name=\"" + this.code + ".__action_" + i +"\" value=\"");
+					out.write("<input type=\"submit\" name=\"" + this.code + ".__action_" + i +"\" id=\"__action_" + i + "\" value=\"");
 					out.write(new LocalizableString(action.getLabel()).toString());
 					out.write("\"/>");									
 					i++;
@@ -156,15 +156,7 @@
 	}
 
 	@Override
-	protected void createMain(Node node, Writer out) throws IOException {
-		if (node instanceof FieldNode) {
-			createField((FieldNode) node, out);
-		} else {
-			super.createMain(node, out);
-		}
-	}
-
-	protected void createField(FieldNode node, Writer out) throws IOException {
+	protected void createFieldNodeOutput(FieldNode node, Writer out) throws IOException {
 		PropertyInfo property = node.getProperty();
 		if (property.getType().isEnum() || MagmaBeanSupport.class.isAssignableFrom(property.getType())) {
 			createSelectionListField(node, out);
@@ -187,21 +179,6 @@
 		}
 		
 	}
-	
-	protected void createBooleanField(FieldNode node, Writer out) throws IOException {
-		StringBuilder sb = new StringBuilder();
-		sb.append("MagmaField CheckBox");
-		commonFieldClasses(node, sb);
-		createAdditionalInfo(node, sb.toString(), out);	
-		out.append("<input type=\"checkbox\"");
-		createNameAndId(node, out);
-		out.append(" value=\"true\"");
-		Boolean bool = (Boolean) ViewUtils.getNodeValue(node, bean);
-		if (bool != null && bool.booleanValue()) {
-			out.append(" checked=\"checked\"");
-		}
-		out.append("/>");
-	}
 
 	protected void createSelectionListField(FieldNode node, Writer out) throws IOException {
 		PropertyInfo property = node.getProperty();
@@ -241,7 +218,7 @@
 	}
 	
 	
-	private void createRadioField(FieldNode node, List<?> elements, Writer out) throws IOException {
+	protected void createRadioField(FieldNode node, List<?> elements, Writer out) throws IOException {
 		StringBuilder sb = new StringBuilder();
 		sb.append("MagmaField RadioButton");
 		commonFieldClasses(node, sb);
@@ -260,7 +237,7 @@
 
 
 
-	private void createRadioButton(FieldNode node, Writer out, int i, Object object) throws IOException {
+	protected void createRadioButton(FieldNode node, Writer out, int i, Object object) throws IOException {
 		String val = node.getProperty().toString(object);
 		out.append("<input type=\"radio\"");
 		createNameAndId(node, out, Integer.toString(i));
@@ -306,9 +283,7 @@
 		out.append("</select>");		
 	}
 
-
-
-	private void createDropDownOption(FieldNode node, Writer out, Object object) throws IOException {
+	protected void createDropDownOption(FieldNode node, Writer out, Object object) throws IOException {
 		String val = node.getProperty().toString(object);
 		out.append("<option value=\"");
 		out.append(val);
@@ -328,6 +303,23 @@
 		}
 		out.append("</option>");
 	}
+	
+	
+	protected void createBooleanField(FieldNode node, Writer out) throws IOException {
+		StringBuilder sb = new StringBuilder();
+		sb.append("MagmaField CheckBox");
+		commonFieldClasses(node, sb);
+		createAdditionalInfo(node, sb.toString(), out);	
+		out.append("<input type=\"checkbox\"");
+		createNameAndId(node, out);
+		out.append(" value=\"true\"");
+		Boolean bool = (Boolean) ViewUtils.getNodeValue(node, bean);
+		if (bool != null && bool.booleanValue()) {
+			out.append(" checked=\"checked\"");
+		}
+		out.append("/>");
+	}
+
 
 	protected void createTextField(FieldNode node, Writer out) throws IOException {
 		PropertyInfo property = node.getProperty();



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