You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2023/01/04 16:38:38 UTC
[struts-examples] branch master updated: Cleans up code and reformats it
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/master by this push:
new fc3ed80 Cleans up code and reformats it
fc3ed80 is described below
commit fc3ed80e48434f1e669e53a4a143a269a3cd2f0a
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Wed Jan 4 17:38:01 2023 +0100
Cleans up code and reformats it
---
.../org/apache/struts/edit/action/EditAction.java | 127 +++++++++------------
.../java/org/apache/struts/edit/model/Person.java | 107 +++++++++--------
.../java/org/apache/struts/edit/model/State.java | 62 +++++-----
.../apache/struts/edit/service/EditService.java | 7 +-
.../struts/edit/service/EditServiceInMemory.java | 67 +++++------
.../struts/edit/action/EditAction.properties | 3 +-
form-tags/src/main/resources/struts.xml | 36 +++---
form-tags/src/main/webapp/WEB-INF/web.xml | 22 ++--
form-tags/src/main/webapp/edit.jsp | 28 ++---
form-tags/src/main/webapp/index.jsp | 12 +-
form-tags/src/main/webapp/thankyou.jsp | 20 ++--
11 files changed, 225 insertions(+), 266 deletions(-)
diff --git a/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java b/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
index 700b2f5..24bc5c5 100644
--- a/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
+++ b/form-tags/src/main/java/org/apache/struts/edit/action/EditAction.java
@@ -13,83 +13,58 @@ import java.util.List;
/**
* Acts as a controller to handle actions
* related to editing a Person.
- * @author bruce phillips
- *
*/
public class EditAction extends ActionSupport {
-
- private static final long serialVersionUID = 1L;
-
- private EditService editService = new EditServiceInMemory();
-
- private Person personBean;
-
- private String [] sports = {"football", "baseball", "basketball" };
-
- private String [] genders = {"male", "female", "not sure" };
-
- private List<State> states ;
-
- private String [] carModelsAvailable = {"Ford","Chrysler","Toyota","Nissan"};
-
- public String execute() throws Exception {
-
- editService.savePerson( getPersonBean() );
-
- return SUCCESS;
-
- }
-
-
- public String input() throws Exception {
-
- setPersonBean( editService.getPerson() );
-
- return INPUT;
- }
-
- public Person getPersonBean() {
-
-
- return personBean;
-
- }
-
- public void setPersonBean(Person person) {
-
- personBean = person;
-
- }
-
-
- public List<String> getSports() {
- return Arrays.asList(sports);
- }
-
- public List<String> getGenders() {
-
- return Arrays.asList(genders);
-
- }
-
-
-
- public List<State> getStates() {
-
- states = new ArrayList<State>();
- states.add( new State("AZ", "Arizona") );
- states.add( new State("CA", "California") );
- states.add( new State("FL", "Florida") );
- states.add( new State("KS", "Kansas") );
- states.add( new State("NY", "New York") );
-
- return states;
- }
-
-
-
- public String [] getCarModelsAvailable() {
- return carModelsAvailable;
- }
+
+ private final EditService editService = new EditServiceInMemory();
+
+ private Person personBean;
+
+ private final String[] sports = {"football", "baseball", "basketball"};
+
+ private final String[] genders = {"male", "female", "not sure"};
+
+ private final String[] carModelsAvailable = {"Ford", "Chrysler", "Toyota", "Nissan"};
+
+ public String execute() throws Exception {
+ editService.savePerson(getPersonBean());
+ return SUCCESS;
+ }
+
+ public String input() throws Exception {
+ setPersonBean(editService.getPerson());
+ return INPUT;
+ }
+
+ public Person getPersonBean() {
+ return personBean;
+ }
+
+ public void setPersonBean(Person person) {
+ personBean = person;
+ }
+
+ public List<String> getSports() {
+ return Arrays.asList(sports);
+ }
+
+ public List<String> getGenders() {
+ return Arrays.asList(genders);
+ }
+
+ public List<State> getStates() {
+ List<State> states = new ArrayList<>();
+ states.add(new State("AZ", "Arizona"));
+ states.add(new State("CA", "California"));
+ states.add(new State("FL", "Florida"));
+ states.add(new State("KS", "Kansas"));
+ states.add(new State("NY", "New York"));
+
+ return states;
+ }
+
+ public String[] getCarModelsAvailable() {
+ return carModelsAvailable;
+ }
}
diff --git a/form-tags/src/main/java/org/apache/struts/edit/model/Person.java b/form-tags/src/main/java/org/apache/struts/edit/model/Person.java
index 392a8de..e291f45 100644
--- a/form-tags/src/main/java/org/apache/struts/edit/model/Person.java
+++ b/form-tags/src/main/java/org/apache/struts/edit/model/Person.java
@@ -2,95 +2,92 @@ package org.apache.struts.edit.model;
import java.util.Arrays;
-
/**
* Models a Person who registers.
- * @author bruce phillips
- *
*/
-public class Person
-{
+public class Person {
private String firstName;
private String lastName;
private String sport;
private String gender;
private String residency;
private boolean over21;
- private String [] carModels;
-
+ private String[] carModels;
+ private String preferredCarModel;
- public String getFirstName()
- {
+ public String getFirstName() {
return firstName;
}
- public void setFirstName(String firstName)
- {
+ public void setFirstName(String firstName) {
this.firstName = firstName;
}
- public String getLastName()
- {
+ public String getLastName() {
return lastName;
}
- public void setLastName(String lastName)
- {
+ public void setLastName(String lastName) {
this.lastName = lastName;
}
+ public void setSport(String sport) {
+ this.sport = sport;
+ }
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+ public String getGender() {
+ return gender;
+ }
- public void setSport(String sport) {
- this.sport = sport;
- }
-
- public void setGender(String gender) {
- this.gender = gender;
- }
+ public String getSport() {
+ return sport;
+ }
- public String getGender() {
- return gender;
- }
+ public void setResidency(String residency) {
+ this.residency = residency;
+ }
- public String getSport() {
- return sport;
- }
+ public String getResidency() {
+ return residency;
+ }
- public void setResidency(String residency) {
- this.residency = residency;
- }
+ public void setOver21(boolean over21) {
+ this.over21 = over21;
+ }
- public String getResidency() {
- return residency;
- }
+ public boolean isOver21() {
+ return over21;
+ }
- public void setOver21(boolean over21) {
- this.over21 = over21;
- }
+ public void setCarModels(String[] carModels) {
+ this.carModels = carModels;
+ }
- public boolean isOver21() {
- return over21;
- }
+ public String[] getCarModels() {
+ return carModels;
+ }
- public void setCarModels(String [] carModels) {
- this.carModels = carModels;
- }
+ public String getPreferredCarModel() {
+ return preferredCarModel;
+ }
- public String [] getCarModels() {
- return carModels;
- }
+ public void setPreferredCarModel(String preferredCarModel) {
+ this.preferredCarModel = preferredCarModel;
+ }
- public String toString()
- {
+ public String toString() {
return "First Name: " + getFirstName() + " | " +
- " Last Name: " + getLastName() + " | " +
- " Favorite Sport: " + getSport() + " | " +
- " Gender: " + getGender() + " | " +
- " Residency: " + getResidency() + " | " +
- " Over 21: " + isOver21() + " | " +
- " Car models: " + Arrays.asList( getCarModels() ) ;
-
+ " Last Name: " + getLastName() + " | " +
+ " Favorite Sport: " + getSport() + " | " +
+ " Gender: " + getGender() + " | " +
+ " Residency: " + getResidency() + " | " +
+ " Over 21: " + isOver21() + " | " +
+ " Car models: " + Arrays.asList(getCarModels()) + " | " +
+ " Preferred Car Model: " + getPreferredCarModel();
+
}
}
diff --git a/form-tags/src/main/java/org/apache/struts/edit/model/State.java b/form-tags/src/main/java/org/apache/struts/edit/model/State.java
index bb927e1..9d4916f 100644
--- a/form-tags/src/main/java/org/apache/struts/edit/model/State.java
+++ b/form-tags/src/main/java/org/apache/struts/edit/model/State.java
@@ -1,39 +1,33 @@
package org.apache.struts.edit.model;
public class State {
-
- private String stateAbbr;
-
- private String stateName;
-
- public State (String stateAbbr, String stateName) {
-
- this.stateAbbr = stateAbbr;
- this.stateName = stateName;
-
- }
-
- public void setStateAbbr(String stateAbbr) {
- this.stateAbbr = stateAbbr;
- }
-
- public String getStateAbbr() {
- return stateAbbr;
- }
-
- public void setStateName(String stateName) {
- this.stateName = stateName;
- }
-
- public String getStateName() {
- return stateName;
- }
-
- public String toString() {
-
- return getStateAbbr() ;
-
- }
-
+
+ private String stateAbbr;
+ private String stateName;
+
+ public State(String stateAbbr, String stateName) {
+ this.stateAbbr = stateAbbr;
+ this.stateName = stateName;
+ }
+
+ public void setStateAbbr(String stateAbbr) {
+ this.stateAbbr = stateAbbr;
+ }
+
+ public String getStateAbbr() {
+ return stateAbbr;
+ }
+
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
+
+ public String getStateName() {
+ return stateName;
+ }
+
+ public String toString() {
+ return getStateAbbr();
+ }
}
diff --git a/form-tags/src/main/java/org/apache/struts/edit/service/EditService.java b/form-tags/src/main/java/org/apache/struts/edit/service/EditService.java
index 79d759a..b32fb91 100644
--- a/form-tags/src/main/java/org/apache/struts/edit/service/EditService.java
+++ b/form-tags/src/main/java/org/apache/struts/edit/service/EditService.java
@@ -3,10 +3,9 @@ package org.apache.struts.edit.service;
import org.apache.struts.edit.model.Person;
public interface EditService {
-
-
- Person getPerson() ;
- void savePerson(Person personBean);
+ Person getPerson();
+
+ void savePerson(Person personBean);
}
diff --git a/form-tags/src/main/java/org/apache/struts/edit/service/EditServiceInMemory.java b/form-tags/src/main/java/org/apache/struts/edit/service/EditServiceInMemory.java
index 7638152..291dd58 100644
--- a/form-tags/src/main/java/org/apache/struts/edit/service/EditServiceInMemory.java
+++ b/form-tags/src/main/java/org/apache/struts/edit/service/EditServiceInMemory.java
@@ -6,46 +6,37 @@ import org.apache.struts.edit.model.Person;
* Implement Services needed to edit and save
* a Person object's state. In this implementation
* the Person object's state is stored in memory
- * @author brucephillips
- *
*/
public class EditServiceInMemory implements EditService {
-
-
- private static Person person ;
- private static String [] carModels = {"Ford","Nissan"};
-
- static {
-
- person = new Person();
- person.setFirstName("Bruce");
- person.setLastName("Phillips");
- person.setSport("basketball");
- person.setGender("not sure");
- person.setResidency("KS");
- person.setOver21(true);
- person.setCarModels( carModels);
-
- }
-
-
- public Person getPerson() {
-
- return EditServiceInMemory.person;
- }
-
-
- public void savePerson(Person personBean) {
-
- EditServiceInMemory.person.setFirstName(personBean.getFirstName() );
- EditServiceInMemory.person.setLastName(personBean.getLastName() );
- EditServiceInMemory.person.setSport(personBean.getSport() );
- EditServiceInMemory.person.setGender( personBean.getGender() );
- EditServiceInMemory.person.setResidency( personBean.getResidency() );
- EditServiceInMemory.person.setOver21( personBean.isOver21() );
- EditServiceInMemory.person.setCarModels(personBean.getCarModels() );
-
- }
+ private static final Person person;
+ private static final String[] carModels = {"Ford", "Nissan"};
+
+ static {
+ person = new Person();
+ person.setFirstName("Bruce");
+ person.setLastName("Phillips");
+ person.setSport("basketball");
+ person.setGender("not sure");
+ person.setResidency("KS");
+ person.setOver21(true);
+ person.setCarModels(carModels);
+ person.setPreferredCarModel("");
+ }
+
+ public Person getPerson() {
+ return EditServiceInMemory.person;
+ }
+
+ public void savePerson(Person personBean) {
+ EditServiceInMemory.person.setFirstName(personBean.getFirstName());
+ EditServiceInMemory.person.setLastName(personBean.getLastName());
+ EditServiceInMemory.person.setSport(personBean.getSport());
+ EditServiceInMemory.person.setGender(personBean.getGender());
+ EditServiceInMemory.person.setResidency(personBean.getResidency());
+ EditServiceInMemory.person.setOver21(personBean.isOver21());
+ EditServiceInMemory.person.setCarModels(personBean.getCarModels());
+ EditServiceInMemory.person.setPreferredCarModel(personBean.getPreferredCarModel());
+ }
}
diff --git a/form-tags/src/main/resources/org/apache/struts/edit/action/EditAction.properties b/form-tags/src/main/resources/org/apache/struts/edit/action/EditAction.properties
index 0f08667..06d87db 100644
--- a/form-tags/src/main/resources/org/apache/struts/edit/action/EditAction.properties
+++ b/form-tags/src/main/resources/org/apache/struts/edit/action/EditAction.properties
@@ -5,4 +5,5 @@ personBean.gender=Gender
personBean.residency=State resident
personBean.over21=21 or older
personBean.carModels=Car models owned
-submit=Save Changes
\ No newline at end of file
+personBean.preferredCarModels=Preferred car model
+submit=Save Changes
diff --git a/form-tags/src/main/resources/struts.xml b/form-tags/src/main/resources/struts.xml
index 8e27b0d..6724e27 100644
--- a/form-tags/src/main/resources/struts.xml
+++ b/form-tags/src/main/resources/struts.xml
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
- "http://struts.apache.org/dtds/struts-2.5.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 6.0//EN"
+ "http://struts.apache.org/dtds/struts-6.0.dtd">
<struts>
- <constant name="struts.devMode" value="true" />
+ <constant name="struts.devMode" value="true"/>
- <package name="basicstruts2" extends="struts-default">
+ <package name="basicstruts2" extends="struts-default">
- <default-action-ref name="index" />
+ <default-action-ref name="index"/>
- <!-- If no class attribute is specified the framework will assume success and
+ <!-- If no class attribute is specified the framework will assume success and
render the result index.jsp -->
<!-- If no name value for the result node is specified the success value is the default -->
- <action name="index">
- <result>/index.jsp</result>
- </action>
+ <action name="index">
+ <result>/index.jsp</result>
+ </action>
- <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
- <result name="input">/edit.jsp</result>
- </action>
-
- <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
- <result name="success">/thankyou.jsp</result>
- </action>
+ <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input">
+ <result name="input">/edit.jsp</result>
+ </action>
- </package>
+ <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute">
+ <result name="success">/thankyou.jsp</result>
+ </action>
-</struts>
\ No newline at end of file
+ </package>
+
+</struts>
diff --git a/form-tags/src/main/webapp/WEB-INF/web.xml b/form-tags/src/main/webapp/WEB-INF/web.xml
index a0db30c..e4733ec 100644
--- a/form-tags/src/main/webapp/WEB-INF/web.xml
+++ b/form-tags/src/main/webapp/WEB-INF/web.xml
@@ -1,19 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<display-name>Form Tags</display-name>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+
+ <display-name>Form Tags</display-name>
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
<filter>
<filter-name>struts2</filter-name>
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
- <filter-mapping>
+ <filter-mapping>
<filter-name>struts2</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
</web-app>
diff --git a/form-tags/src/main/webapp/edit.jsp b/form-tags/src/main/webapp/edit.jsp
index 948f63e..fae8e78 100644
--- a/form-tags/src/main/webapp/edit.jsp
+++ b/form-tags/src/main/webapp/edit.jsp
@@ -1,12 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<s:head />
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Struts 2 Form Tags - Edit Person</title>
+ <s:head/>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Struts 2 Form Tags - Edit Person</title>
</head>
<body>
<h1>Update Information</h1>
@@ -14,15 +13,16 @@
<p>Use the form below to edit your information.</p>
<s:form action="save" method="post">
-<s:textfield key="personBean.firstName" />
-<s:textfield key="personBean.lastName" />
-<s:select key="personBean.sport" list="sports" />
-<s:radio key="personBean.gender" list="genders" />
-<s:select key="personBean.residency" list="states" listKey="stateAbbr" listValue="stateName" />
-<s:checkbox key="personBean.over21" />
-<s:checkboxlist key="personBean.carModels" list="carModelsAvailable" />
-<s:submit key="submit" />
+ <s:textfield key="personBean.firstName"/>
+ <s:textfield key="personBean.lastName"/>
+ <s:select key="personBean.sport" list="sports"/>
+ <s:radio key="personBean.gender" list="genders"/>
+ <s:select key="personBean.residency" list="states" listKey="stateAbbr" listValue="stateName"/>
+ <s:checkbox key="personBean.over21"/>
+ <s:checkboxlist key="personBean.carModels" list="carModelsAvailable"/>
+ <s:radio name="personBean.preferredCarModel" label="Status" list="carModelsAvailable"/>
+ <s:submit key="submit"/>
</s:form>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/form-tags/src/main/webapp/index.jsp b/form-tags/src/main/webapp/index.jsp
index 88209d8..c761f79 100644
--- a/form-tags/src/main/webapp/index.jsp
+++ b/form-tags/src/main/webapp/index.jsp
@@ -1,16 +1,16 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Struts 2 Form Tags - Welcome</title>
+ <s:head/>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Struts 2 Form Tags - Welcome</title>
</head>
<body>
<h1>Welcome To Struts 2!</h1>
-<p><a href='<s:url action="edit" />' >Edit your information</a></p>
+<p><a href='<s:url action="edit" />'>Edit your information</a></p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/form-tags/src/main/webapp/thankyou.jsp b/form-tags/src/main/webapp/thankyou.jsp
index 5fa306f..7951ddf 100644
--- a/form-tags/src/main/webapp/thankyou.jsp
+++ b/form-tags/src/main/webapp/thankyou.jsp
@@ -1,21 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Update Successful</title>
+ <s:head/>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>Update Successful</title>
</head>
<body>
<h1>Updated Information</h1>
+<p>Your information: <s:property value="personBean"/></p>
-<p>Your information: <s:property value="personBean" /> </p>
-
-<p><a href="<s:url action='index' />" >Return to home page</a>.</p>
+<p><a href="<s:url action='index' />">Return to home page</a>.</p>
</body>
-</html>
\ No newline at end of file
+</html>