You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2004/03/29 22:56:14 UTC
cvs commit: cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java CalculatorFlow.java FormFlow.java PersistenceFlow.java
stephan 2004/03/29 12:56:14
Modified: src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java
AbstractFormFlow.java
src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java
CalculatorFlow.java FormFlow.java
PersistenceFlow.java
Log:
Tabs2Spaces, I didn't get VIM to work properly under Debian.
Revision Changes Path
1.2 +14 -14 cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/AbstractFormFlow.java
Index: AbstractFormFlow.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/forms/flow/java/AbstractFormFlow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractFormFlow.java 29 Mar 2004 17:47:22 -0000 1.1
+++ AbstractFormFlow.java 29 Mar 2004 20:56:14 -0000 1.2
@@ -35,16 +35,16 @@
//if (localeStr != null)
// locale = I18nUtils.parseLocale(localeStr, locale);
- SourceResolver resolver = null;
- FormManager formManager = null;
+ SourceResolver resolver = null;
+ FormManager formManager = null;
Source source = null;
Form form = null;
try {
resolver = (SourceResolver) getComponent(SourceResolver.ROLE);
-
+
source = resolver.resolveURI(formSource);
- formManager = (FormManager) getComponent(FormManager.ROLE);
+ formManager = (FormManager) getComponent(FormManager.ROLE);
form = formManager.createForm(source);
/*if (formHandler != null) {
@@ -66,8 +66,8 @@
} finally {
if (source != null)
resolver.release(source);
- releaseComponent(resolver);
- releaseComponent(formManager);
+ releaseComponent(resolver);
+ releaseComponent(formManager);
}
return form;
}
@@ -131,26 +131,26 @@
return widget == null ? null : widget.getId();
}
- protected String showForm(Form form, String uri) {
- return showForm(form, uri, new VarMap());
- }
+ protected String showForm(Form form, String uri) {
+ return showForm(form, uri, new VarMap());
+ }
protected Binding loadBinding(String bindingURI) {
- SourceResolver resolver = null;
- BindingManager bindingManager = null;
+ SourceResolver resolver = null;
+ BindingManager bindingManager = null;
Source source = null;
Binding binding = null;
try {
- resolver = (SourceResolver) getComponent(SourceResolver.ROLE);
+ resolver = (SourceResolver) getComponent(SourceResolver.ROLE);
source = resolver.resolveURI(bindingURI);
- bindingManager = (BindingManager) getComponent(BindingManager.ROLE);
+ bindingManager = (BindingManager) getComponent(BindingManager.ROLE);
binding = bindingManager.createBinding(source);
} catch (Exception e) {
throw new RuntimeException("Cannot load form binding from '"+bindingURI+"'", e);
} finally {
if (source != null)
resolver.release(source);
- releaseComponent(resolver);
+ releaseComponent(resolver);
releaseComponent(bindingManager);
}
return binding;
1.2 +8 -8 cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/CalculatorFlow.java
Index: CalculatorFlow.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/CalculatorFlow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CalculatorFlow.java 29 Mar 2004 17:47:22 -0000 1.1
+++ CalculatorFlow.java 29 Mar 2004 20:56:14 -0000 1.2
@@ -33,8 +33,8 @@
} else if (op.equals("multiply")) {
sendResult(a, b, op, a * b);
} else if (op.equals("divide")) {
- if (b==0f)
- sendMessage("Error: Cannot divide by zero!");
+ if (b==0f)
+ sendMessage("Error: Cannot divide by zero!");
sendResult(a, b, op, a / b);
} else {
sendMessage("Error: Unkown operator!");
@@ -47,12 +47,12 @@
String uri = "page/calculator-" + name.toLowerCase();
sendPageAndWait(uri, new VarMap().add("a", a).add("b", b).add("count", count));
- float value = 0f;
- try {
- value = Float.parseFloat(getRequest().getParameter(name));
- } catch (NumberFormatException nfe) {
+ float value = 0f;
+ try {
+ value = Float.parseFloat(getRequest().getParameter(name));
+ } catch (NumberFormatException nfe) {
sendMessage("Error: \""+getRequest().getParameter(name)+"\" is not a correct number!");
- }
+ }
return value;
}
@@ -65,7 +65,7 @@
sendPage("page/calculator-result", new VarMap().add("a", a).add("b", b).add("operator", op).add("result", result).add("count", count));
}
- private void sendMessage(String message) {
+ private void sendMessage(String message) {
sendPageAndWait("page/calculator-message", new VarMap().add("message", message).add("count", count));
}
}
1.2 +2 -2 cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java
Index: FormFlow.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/FormFlow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormFlow.java 29 Mar 2004 17:47:22 -0000 1.1
+++ FormFlow.java 29 Mar 2004 20:56:14 -0000 1.2
@@ -45,8 +45,8 @@
showForm(form, "form/form1");
sendPage("page/form1-result", new VarMap().add("email", ((Field)form.getWidget("email")).getValue())
- .add("somebool", ((BooleanField)form.getWidget("somebool")).getValue())
- .add("firstname", ((Field)((Repeater)form.getWidget("contacts")).getWidget(1, "firstname")).getValue()));
+ .add("somebool", ((BooleanField)form.getWidget("somebool")).getValue())
+ .add("firstname", ((Field)((Repeater)form.getWidget("contacts")).getWidget(1, "firstname")).getValue()));
}
public void doEditForm2() throws BindingException {
1.3 +10 -10 cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java
Index: PersistenceFlow.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/javaflow/java/org/apache/cocoon/samples/flow/java/PersistenceFlow.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PersistenceFlow.java 29 Mar 2004 20:42:03 -0000 1.2
+++ PersistenceFlow.java 29 Mar 2004 20:56:14 -0000 1.3
@@ -33,7 +33,7 @@
public void doInsertEmployee() throws BindingException {
- PersistenceBroker broker = getPersistenceBroker();
+ PersistenceBroker broker = getPersistenceBroker();
// Create a empty Bean
Employee employee = new Employee();
@@ -64,14 +64,14 @@
else
throw new IllegalStateException("No parameter 'id'");
- PersistenceBroker broker = getPersistenceBroker();
-
+ PersistenceBroker broker = getPersistenceBroker();
+
// Create a empty Bean
Employee employee = new Employee();
// Fill some initial data to the bean
employee.setId(id);
// Load bean based on the given PrimaryKey
- employee = (Employee) broker.getObjectByIdentity(new Identity(employee, broker));
+ employee = (Employee) broker.getObjectByIdentity(new Identity(employee, broker));
// Load form descriptor
Form form = loadForm("forms/employee.xml");
// Load form binding
@@ -84,7 +84,7 @@
binding.saveFormToModel(form, employee);
// Update Bean in Database
- broker.store(employee);
+ broker.store(employee);
// Send response to the user
doShowEmployee();
@@ -105,8 +105,8 @@
Employee employee = new Employee();
// Fill some initial data to the bean
employee.setId(id);
- // Load bean based on the given PrimaryKey
- employee = (Employee) broker.getObjectByIdentity(new Identity(employee, broker));
+ // Load bean based on the given PrimaryKey
+ employee = (Employee) broker.getObjectByIdentity(new Identity(employee, broker));
// Remove bean
broker.delete(employee);
// Send response to the user
@@ -119,15 +119,15 @@
// Query all objects
Set results = new HashSet();
- QueryByCriteria query = new QueryByCriteria(Employee.class, new Criteria());
+ QueryByCriteria query = new QueryByCriteria(Employee.class, new Criteria());
for(Iterator i=broker.getCollectionByQuery(query).iterator(); i.hasNext();) {
results.add(i.next());
- }
+ }
// Send response to the user
sendPage("page/employee-result", new VarMap().add("employee", results));
}
public PersistenceBroker getPersistenceBroker() {
return ((PBFactory)getComponent(PBFactory.ROLE)).defaultPersistenceBroker();
- }
+ }
}