You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 16:02:22 UTC
svn commit: r471756 [5/31] - in /struts/struts2/trunk: apps/blank/
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/mailreader/src/main/java/mailreader2/
apps/portlet/src/main/java/org/apache/struts2/portlet/example/ apps/portle...
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Hangman.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
@@ -23,84 +26,84 @@
import java.util.List;
public class Hangman implements Serializable {
-
- private static final long serialVersionUID = 8566954355839652509L;
- private Vocab vocab;
-
- private Boolean win = false;
-
- private int guessLeft = 5;
- public List<Character> charactersAvailable;
- public List<Character> charactersGuessed;
-
- public Hangman(Vocab vocab) {
- // Arrays.asList(...) returns List that doesn't support remove(), hence
- // we wrap it with an ArrayList to avoid UnsupportedOperationException
- // when doing a remove()
- charactersAvailable = new ArrayList<Character>(Arrays.asList(
- new Character[] {
- Character.valueOf('A'), Character.valueOf('B'), Character.valueOf('C'),
- Character.valueOf('D'), Character.valueOf('E'), Character.valueOf('F'),
- Character.valueOf('G'), Character.valueOf('H'), Character.valueOf('I'),
- Character.valueOf('J'), Character.valueOf('K'), Character.valueOf('L'),
- Character.valueOf('M'), Character.valueOf('N'), Character.valueOf('O'),
- Character.valueOf('P'), Character.valueOf('Q'), Character.valueOf('R'),
- Character.valueOf('S'), Character.valueOf('T'), Character.valueOf('U'),
- Character.valueOf('V'), Character.valueOf('W'), Character.valueOf('X'),
- Character.valueOf('Y'), Character.valueOf('Z')
- }));
- charactersGuessed = new ArrayList<Character>();
- this.vocab = vocab;
- }
-
- public void guess(Character character) {
- assert(character != null);
-
- synchronized(charactersAvailable) {
- if (guessLeft < 0) {
- throw new HangmanException(
- HangmanException.Type.valueOf("GAME_ENDED"), "Game already eneded");
- }
- Character characterInUpperCase = Character.toUpperCase(character);
- boolean ok = charactersAvailable.remove(characterInUpperCase);
- if (ok) {
- charactersGuessed.add(characterInUpperCase);
- if (! vocab.containCharacter(characterInUpperCase)) {
- guessLeft = guessLeft - 1;
- }
- }
- if (vocab.containsAllCharacter(charactersGuessed)) {
- win = true;
- }
- System.out.println(" *********************************** "+win);
- }
- }
-
- public Boolean isWin() {
- return this.win;
- }
-
- public Vocab getVocab() {
- return vocab;
- }
-
- public Boolean gameEnded() {
- return ((guessLeft < 0) || win);
- }
-
- public Integer guessLeft() {
- return guessLeft;
- }
-
- public List<Character> getCharactersAvailable() {
- synchronized(charactersAvailable) {
- return new ArrayList<Character>(charactersAvailable);
- //return charactersAvailable;
- }
- }
-
- public boolean characterGuessedBefore(Character character) {
- return charactersGuessed.contains(character);
- }
+ private static final long serialVersionUID = 8566954355839652509L;
+
+ private Vocab vocab;
+
+ private Boolean win = false;
+
+ private int guessLeft = 5;
+ public List<Character> charactersAvailable;
+ public List<Character> charactersGuessed;
+
+ public Hangman(Vocab vocab) {
+ // Arrays.asList(...) returns List that doesn't support remove(), hence
+ // we wrap it with an ArrayList to avoid UnsupportedOperationException
+ // when doing a remove()
+ charactersAvailable = new ArrayList<Character>(Arrays.asList(
+ new Character[] {
+ Character.valueOf('A'), Character.valueOf('B'), Character.valueOf('C'),
+ Character.valueOf('D'), Character.valueOf('E'), Character.valueOf('F'),
+ Character.valueOf('G'), Character.valueOf('H'), Character.valueOf('I'),
+ Character.valueOf('J'), Character.valueOf('K'), Character.valueOf('L'),
+ Character.valueOf('M'), Character.valueOf('N'), Character.valueOf('O'),
+ Character.valueOf('P'), Character.valueOf('Q'), Character.valueOf('R'),
+ Character.valueOf('S'), Character.valueOf('T'), Character.valueOf('U'),
+ Character.valueOf('V'), Character.valueOf('W'), Character.valueOf('X'),
+ Character.valueOf('Y'), Character.valueOf('Z')
+ }));
+ charactersGuessed = new ArrayList<Character>();
+ this.vocab = vocab;
+ }
+
+ public void guess(Character character) {
+ assert(character != null);
+
+ synchronized(charactersAvailable) {
+ if (guessLeft < 0) {
+ throw new HangmanException(
+ HangmanException.Type.valueOf("GAME_ENDED"), "Game already eneded");
+ }
+ Character characterInUpperCase = Character.toUpperCase(character);
+ boolean ok = charactersAvailable.remove(characterInUpperCase);
+ if (ok) {
+ charactersGuessed.add(characterInUpperCase);
+ if (! vocab.containCharacter(characterInUpperCase)) {
+ guessLeft = guessLeft - 1;
+ }
+ }
+ if (vocab.containsAllCharacter(charactersGuessed)) {
+ win = true;
+ }
+ System.out.println(" *********************************** "+win);
+ }
+ }
+
+ public Boolean isWin() {
+ return this.win;
+ }
+
+ public Vocab getVocab() {
+ return vocab;
+ }
+
+ public Boolean gameEnded() {
+ return ((guessLeft < 0) || win);
+ }
+
+ public Integer guessLeft() {
+ return guessLeft;
+ }
+
+ public List<Character> getCharactersAvailable() {
+ synchronized(charactersAvailable) {
+ return new ArrayList<Character>(charactersAvailable);
+ //return charactersAvailable;
+ }
+ }
+
+ public boolean characterGuessedBefore(Character character) {
+ return charactersGuessed.contains(character);
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanConstants.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanConstants.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanConstants.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanConstants.java Mon Nov 6 07:01:43 2006
@@ -1,6 +1,26 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.struts2.showcase.hangman;
public class HangmanConstants {
- // keeps a Hangman object in HttpSession
- public static final String HANGMAN_SESSION_KEY = "Hangman_Session_Key";
+ // keeps a Hangman object in HttpSession
+ public static final String HANGMAN_SESSION_KEY = "Hangman_Session_Key";
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanException.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanException.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanException.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanException.java Mon Nov 6 07:01:43 2006
@@ -1,41 +1,44 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
public class HangmanException extends RuntimeException {
-
- private static final long serialVersionUID = -8500292863595941335L;
- enum Type {
- GAME_ENDED,
- NO_VOCAB,
- NO_VOCAB_SOURCE;
- }
-
-
- private Type type;
-
- public HangmanException (Type type, String reason) {
- super(reason);
- this.type = type;
- }
-
- public Type getType() {
- return type;
- }
+ private static final long serialVersionUID = -8500292863595941335L;
+
+ enum Type {
+ GAME_ENDED,
+ NO_VOCAB,
+ NO_VOCAB_SOURCE;
+ }
+
+
+ private Type type;
+
+ public HangmanException (Type type, String reason) {
+ super(reason);
+ this.type = type;
+ }
+
+ public Type getType() {
+ return type;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanService.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanService.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanService.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/HangmanService.java Mon Nov 6 07:01:43 2006
@@ -1,31 +1,34 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
public class HangmanService {
-
- public VocabSource vocabSource;
-
- public HangmanService(VocabSource vocabSource) {
- this.vocabSource = vocabSource;
- }
-
- public Hangman startNewGame() {
- return new Hangman(vocabSource.getRandomVocab());
- }
+
+ public VocabSource vocabSource;
+
+ public HangmanService(VocabSource vocabSource) {
+ this.vocabSource = vocabSource;
+ }
+
+ public Hangman startNewGame() {
+ return new Hangman(vocabSource.getRandomVocab());
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/PropertiesVocabSource.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/PropertiesVocabSource.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/PropertiesVocabSource.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/PropertiesVocabSource.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
@@ -24,45 +27,45 @@
public class PropertiesVocabSource implements VocabSource {
- private Properties prop;
- private List<Vocab> vocabs;
-
- public PropertiesVocabSource() {
- }
-
- public PropertiesVocabSource(Properties prop) {
- assert(prop != null);
- this.prop = prop;
- vocabs = readVocab(prop);
- }
-
- public void setVocabProperties(Properties prop) {
- assert(prop != null);
- this.prop = prop;
- vocabs = readVocab(prop);
- }
-
- public Vocab getRandomVocab() {
- if (vocabs == null) {
- throw new HangmanException(HangmanException.Type.valueOf("NO_VOCAB_SOURCE"), "No vocab source");
- }
- if (vocabs.size() <= 0) {
- throw new HangmanException(HangmanException.Type.valueOf("NO_VOCAB"), "No vocab");
- }
- long vocabIndex = Math.round((Math.random() * (double)prop.size()));
- vocabIndex = vocabIndex == vocabs.size() ? vocabs.size() - 1 : vocabIndex;
- return vocabs.get((int)vocabIndex);
- }
-
- protected List<Vocab> readVocab(Properties prop) {
- List<Vocab> vocabList = new ArrayList<Vocab>();
-
- for (Map.Entry e : prop.entrySet()) {
- String vocab = (String) e.getKey();
- String hint = (String) e.getValue();
-
- vocabList.add(new Vocab(vocab, hint));
- }
- return vocabList;
- }
+ private Properties prop;
+ private List<Vocab> vocabs;
+
+ public PropertiesVocabSource() {
+ }
+
+ public PropertiesVocabSource(Properties prop) {
+ assert(prop != null);
+ this.prop = prop;
+ vocabs = readVocab(prop);
+ }
+
+ public void setVocabProperties(Properties prop) {
+ assert(prop != null);
+ this.prop = prop;
+ vocabs = readVocab(prop);
+ }
+
+ public Vocab getRandomVocab() {
+ if (vocabs == null) {
+ throw new HangmanException(HangmanException.Type.valueOf("NO_VOCAB_SOURCE"), "No vocab source");
+ }
+ if (vocabs.size() <= 0) {
+ throw new HangmanException(HangmanException.Type.valueOf("NO_VOCAB"), "No vocab");
+ }
+ long vocabIndex = Math.round((Math.random() * (double)prop.size()));
+ vocabIndex = vocabIndex == vocabs.size() ? vocabs.size() - 1 : vocabIndex;
+ return vocabs.get((int)vocabIndex);
+ }
+
+ protected List<Vocab> readVocab(Properties prop) {
+ List<Vocab> vocabList = new ArrayList<Vocab>();
+
+ for (Map.Entry e : prop.entrySet()) {
+ String vocab = (String) e.getKey();
+ String hint = (String) e.getValue();
+
+ vocabList.add(new Vocab(vocab, hint));
+ }
+ return vocabList;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/StartHangmanAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
@@ -26,33 +29,33 @@
import com.opensymphony.xwork2.ActionSupport;
public class StartHangmanAction extends ActionSupport implements SessionAware {
-
- private static final long serialVersionUID = 2333463075324892521L;
-
- private HangmanService service;
- private Hangman hangman;
- private Map session;
-
-
- public StartHangmanAction(HangmanService service) {
- this.service = service;
- }
-
- public String execute() throws Exception {
-
- hangman = service.startNewGame();
- session.put(HANGMAN_SESSION_KEY, hangman);
-
- return SUCCESS;
- }
-
- public Hangman getHangman() {
- return hangman;
- }
-
-
- // === SessionAware ===
- public void setSession(Map session) {
- this.session = session;
- }
+
+ private static final long serialVersionUID = 2333463075324892521L;
+
+ private HangmanService service;
+ private Hangman hangman;
+ private Map session;
+
+
+ public StartHangmanAction(HangmanService service) {
+ this.service = service;
+ }
+
+ public String execute() throws Exception {
+
+ hangman = service.startNewGame();
+ session.put(HANGMAN_SESSION_KEY, hangman);
+
+ return SUCCESS;
+ }
+
+ public Hangman getHangman() {
+ return hangman;
+ }
+
+
+ // === SessionAware ===
+ public void setSession(Map session) {
+ this.session = session;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/Vocab.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
@@ -23,61 +26,61 @@
import java.util.List;
public class Vocab implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String vocab;
- private String hint;
- private Character[] characters; // character this vocab is made up of
-
- public Vocab(String vocab, String hint) {
- assert(vocab != null);
- assert(hint != null);
-
- this.vocab = vocab.toUpperCase();
- this.hint = hint;
- }
-
- public String getVocab() { return this.vocab; }
- public String getHint() { return this.hint; }
-
- public Boolean containCharacter(Character character) {
- assert(character != null);
-
- return (vocab.contains(character.toString())) ? true : false;
- }
-
- public Character[] inCharacters() {
- if (characters == null) {
- char[] c = vocab.toCharArray();
- characters = new Character[c.length];
- for (int a=0; a< c.length; a++) {
- characters[a] = Character.valueOf(c[a]);
- }
- }
- return characters;
- }
-
- public boolean containsAllCharacter(List<Character> charactersGuessed) {
- Character[] chars = inCharacters();
- List<Character> tmpChars = Arrays.asList(chars);
- return charactersGuessed.containsAll(tmpChars);
- }
-
- public static void main(String args[]) throws Exception {
- Vocab v = new Vocab("JAVA", "a java word");
-
- List<Character> list1= new ArrayList<Character>();
- list1.add(new Character('J'));
- list1.add(new Character('V'));
-
- List<Character> list2 = new ArrayList<Character>();
- list2.add(new Character('J'));
- list2.add(new Character('V'));
- list2.add(new Character('A'));
-
- System.out.println(v.containsAllCharacter(list1));
- System.out.println(v.containsAllCharacter(list2));
-
- }
+
+ private static final long serialVersionUID = 1L;
+
+ private String vocab;
+ private String hint;
+ private Character[] characters; // character this vocab is made up of
+
+ public Vocab(String vocab, String hint) {
+ assert(vocab != null);
+ assert(hint != null);
+
+ this.vocab = vocab.toUpperCase();
+ this.hint = hint;
+ }
+
+ public String getVocab() { return this.vocab; }
+ public String getHint() { return this.hint; }
+
+ public Boolean containCharacter(Character character) {
+ assert(character != null);
+
+ return (vocab.contains(character.toString())) ? true : false;
+ }
+
+ public Character[] inCharacters() {
+ if (characters == null) {
+ char[] c = vocab.toCharArray();
+ characters = new Character[c.length];
+ for (int a=0; a< c.length; a++) {
+ characters[a] = Character.valueOf(c[a]);
+ }
+ }
+ return characters;
+ }
+
+ public boolean containsAllCharacter(List<Character> charactersGuessed) {
+ Character[] chars = inCharacters();
+ List<Character> tmpChars = Arrays.asList(chars);
+ return charactersGuessed.containsAll(tmpChars);
+ }
+
+ public static void main(String args[]) throws Exception {
+ Vocab v = new Vocab("JAVA", "a java word");
+
+ List<Character> list1= new ArrayList<Character>();
+ list1.add(new Character('J'));
+ list1.add(new Character('V'));
+
+ List<Character> list2 = new ArrayList<Character>();
+ list2.add(new Character('J'));
+ list2.add(new Character('V'));
+ list2.add(new Character('A'));
+
+ System.out.println(v.containsAllCharacter(list1));
+ System.out.println(v.containsAllCharacter(list2));
+
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/VocabSource.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/VocabSource.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/VocabSource.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/hangman/VocabSource.java Mon Nov 6 07:01:43 2006
@@ -1,22 +1,25 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.hangman;
public interface VocabSource {
- Vocab getRandomVocab();
+ Vocab getRandomVocab();
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
- * $Id: Gangster.java 418530 2006-07-01 23:58:13Z mrdon $
+ * $Id: $
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.integration;
@@ -33,9 +36,9 @@
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
// Some code to load the gangster from the db as necessary
-
+
return mapping.findForward("success");
}
-
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java Mon Nov 6 07:01:43 2006
@@ -1,3 +1,23 @@
+/*
+ * $Id: $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.struts2.showcase.integration;
import javax.servlet.http.HttpServletRequest;
@@ -9,12 +29,12 @@
import org.apache.struts.validator.ValidatorForm;
public class GangsterForm extends ValidatorForm {
-
+
private String name;
private String age;
private String description;
private boolean bustedBefore;
-
+
/* (non-Javadoc)
* @see org.apache.struts.action.ActionForm#reset(org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest)
*/
@@ -22,7 +42,7 @@
public void reset(ActionMapping arg0, HttpServletRequest arg1) {
bustedBefore = false;
}
-
+
/* (non-Javadoc)
* @see org.apache.struts.action.ActionForm#validate(org.apache.struts.action.ActionMapping, javax.servlet.http.HttpServletRequest)
*/
@@ -32,10 +52,10 @@
if (name == null || name.length() == 0) {
errors.add("name", new ActionMessage("The name must not be blank"));
}
-
+
return errors;
}
-
+
/**
* @return the age
*/
@@ -84,6 +104,6 @@
public void setName(String name) {
this.name = name;
}
-
-
+
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
- * $Id: Gangster.java 418530 2006-07-01 23:58:13Z mrdon $
+ * $Id: $
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.integration;
@@ -34,15 +37,15 @@
*/
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
+
// Some code to save the gangster to the db as necessary
GangsterForm gform = (GangsterForm) form;
ActionMessages messages = new ActionMessages();
messages.add("msg", new ActionMessage("Gangster "+gform.getName()+" added successfully"));
addMessages(request, messages);
-
+
return mapping.findForward("success");
}
-
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.jsf;
@@ -40,7 +43,7 @@
/**
* Creating a default employee and main skill, since the JSF EL can't handle
* creating new objects as necessary
- *
+ *
*/
public JsfEmployeeAction() {
Employee e = new Employee();
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Employee.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.model;
@@ -28,9 +31,9 @@
public class Employee implements IdEntity {
- private static final long serialVersionUID = -6226845151026823748L;
-
- private Long empId; //textfield w/ conversion
+ private static final long serialVersionUID = -6226845151026823748L;
+
+ private Long empId; //textfield w/ conversion
private String firstName;
private String lastName;
private Date birthDate; //datepicker
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/IdEntity.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.model;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/model/Skill.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.model;
@@ -26,9 +29,9 @@
public class Skill implements IdEntity {
- private static final long serialVersionUID = -4150317722693212439L;
-
- private String name;
+ private static final long serialVersionUID = -4150317722693212439L;
+
+ private String name;
private String description;
public Skill() {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/Gangster.java Mon Nov 6 07:01:43 2006
@@ -1,59 +1,62 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.modelDriven;
import java.io.Serializable;
/**
- * A model class to be used by the simple Model-Driven example.
- *
+ * A model class to be used by the simple Model-Driven example.
+ *
*/
public class Gangster implements Serializable {
- private static final long serialVersionUID = 3688389475320294992L;
-
- private String name;
- private int age;
- private String description;
- private boolean bustedBefore;
-
- public int getAge() {
- return age;
- }
- public void setAge(int age) {
- this.age = age;
- }
- public boolean isBustedBefore() {
- return bustedBefore;
- }
- public void setBustedBefore(boolean bustedBefore) {
- this.bustedBefore = bustedBefore;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
+ private static final long serialVersionUID = 3688389475320294992L;
+
+ private String name;
+ private int age;
+ private String description;
+ private boolean bustedBefore;
+
+ public int getAge() {
+ return age;
+ }
+ public void setAge(int age) {
+ this.age = age;
+ }
+ public boolean isBustedBefore() {
+ return bustedBefore;
+ }
+ public void setBustedBefore(boolean bustedBefore) {
+ this.bustedBefore = bustedBefore;
+ }
+ public String getDescription() {
+ return description;
+ }
+ public void setDescription(String description) {
+ this.description = description;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/modelDriven/ModelDrivenAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.modelDriven;
@@ -22,21 +25,21 @@
/**
* Action to demonstrate simple model-driven feature of the framework.
- *
+ *
*/
public class ModelDrivenAction extends ActionSupport implements ModelDriven {
- private static final long serialVersionUID = 1271130427666936592L;
+ private static final long serialVersionUID = 1271130427666936592L;
+
+ public String input() throws Exception {
+ return SUCCESS;
+ }
+
+ public String execute() throws Exception {
+ return SUCCESS;
+ }
- public String input() throws Exception {
- return SUCCESS;
- }
-
- public String execute() throws Exception {
- return SUCCESS;
- }
-
- public Object getModel() {
- return new Gangster();
- }
+ public Object getModel() {
+ return new Gangster();
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/EditPersonAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.person;
@@ -38,9 +41,9 @@
})
public class EditPersonAction extends ActionSupport {
- private static final long serialVersionUID = 7699491775215130850L;
-
- PersonManager personManager;
+ private static final long serialVersionUID = 7699491775215130850L;
+
+ PersonManager personManager;
List persons = new ArrayList();
public void setPersonManager(PersonManager personManager) {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/ListPeopleAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.person;
@@ -27,10 +30,10 @@
@Result(value="listPeople.ftl", type=FreemarkerResult.class)
public class ListPeopleAction extends ActionSupport {
-
- private static final long serialVersionUID = 3608017189783645371L;
-
- PersonManager personManager;
+
+ private static final long serialVersionUID = 3608017189783645371L;
+
+ PersonManager personManager;
List people = new ArrayList();
public void setPersonManager(PersonManager personManager) {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/NewPersonAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
- * $Id: CreatePerson.java 420385 2006-07-10 00:57:05Z mrdon $
+ * $Id: $
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.person;
@@ -32,10 +35,10 @@
@Result(name="input", value="newPerson.ftl", type=FreemarkerResult.class)
})
public class NewPersonAction extends ActionSupport {
-
- private static final long serialVersionUID = 200410824352645515L;
-
- PersonManager personManager;
+
+ private static final long serialVersionUID = 200410824352645515L;
+
+ PersonManager personManager;
Person person;
public void setPersonManager(PersonManager personManager) {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/Person.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.person;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/person/PersonManager.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.person;
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/sitemesh/NoneDecoratorMapper.java Mon Nov 6 07:01:43 2006
@@ -1,3 +1,23 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.struts2.showcase.sitemesh;
import com.opensymphony.module.sitemesh.Decorator;
@@ -6,9 +26,6 @@
import javax.servlet.http.HttpServletRequest;
-/**
- * @author Patrick Lightbody (plightbo at gmail dot com)
- */
public class NoneDecoratorMapper extends AbstractDecoratorMapper {
public Decorator getDecorator(HttpServletRequest req, Page page) {
if ("none".equals(req.getAttribute("decorator"))) {
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/source/ViewSourceAction.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
- * $Id: CreatePerson.java 420385 2006-07-10 00:57:05Z mrdon $
+ * $Id: $
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.source;
@@ -42,23 +45,23 @@
private String page;
private String className;
private String config;
-
+
private List pageLines;
private List classLines;
private List configLines;
-
+
private int configLine;
private int padding = 10;
-
+
private ServletContext servletContext;
-
+
public String execute() throws MalformedURLException, IOException {
-
+
if (page != null) {
-
+
InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//")+1), getClass());
page = page.replace("//", "/");
-
+
if (in == null) {
in = servletContext.getResourceAsStream(page);
while (in == null && page.indexOf('/', 1) > 0) {
@@ -68,7 +71,7 @@
}
pageLines = read(in, -1);
}
-
+
if (className != null) {
className = "/"+className.replace('.', '/') + ".java";
InputStream in = getClass().getResourceAsStream(className);
@@ -77,7 +80,7 @@
}
classLines = read(in, -1);
}
-
+
if (config != null) {
int pos = config.lastIndexOf(':');
configLine = Integer.parseInt(config.substring(pos+1));
@@ -107,15 +110,15 @@
public void setPage(String page) {
this.page = page;
}
-
+
/**
* @param padding the padding to set
*/
public void setPadding(int padding) {
this.padding = padding;
}
-
-
+
+
/**
* @return the classLines
@@ -137,7 +140,7 @@
public List getPageLines() {
return pageLines;
}
-
+
/**
* @return the className
*/
@@ -158,14 +161,14 @@
public String getPage() {
return page;
}
-
+
/**
* @return the configLine
*/
public int getConfigLine() {
return configLine;
}
-
+
/**
* @return the padding
*/
@@ -176,7 +179,7 @@
/**
* Reads in a strea, optionally only including the target line number
* and its padding
- *
+ *
* @param in The input stream
* @param targetLineNumber The target line number, negative to read all
* @return A list of lines
@@ -193,7 +196,7 @@
}
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
+
int lineno = 0;
String line;
while ((line = reader.readLine()) != null) {
@@ -212,6 +215,6 @@
public void setServletContext(ServletContext arg0) {
this.servletContext = arg0;
}
-
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actionPrefix/SubmitAction.java Mon Nov 6 07:01:43 2006
@@ -1,22 +1,42 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.struts2.showcase.tag.nonui.actionPrefix;
import com.opensymphony.xwork2.ActionSupport;
public class SubmitAction extends ActionSupport {
- private static final long serialVersionUID = -7832803019378213087L;
-
- private String text;
-
- public String getText() { return text; }
- public void setText(String text) { this.text = text; }
-
- public String execute() throws Exception {
- return SUCCESS;
- }
-
- public String alternateMethod() {
- return "methodPrefixResult";
- }
-
+ private static final long serialVersionUID = -7832803019378213087L;
+
+ private String text;
+
+ public String getText() { return text; }
+ public void setText(String text) { this.text = text; }
+
+ public String execute() throws Exception {
+ return SUCCESS;
+ }
+
+ public String alternateMethod() {
+ return "methodPrefixResult";
+ }
+
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/actiontag/ActionTagDemo.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.tag.nonui.actiontag;
@@ -22,14 +25,14 @@
/**
*/
public class ActionTagDemo extends ActionSupport {
-
- private static final long serialVersionUID = -2749145880590245184L;
- public String show() throws Exception {
- return SUCCESS;
- }
-
- public String doInclude() throws Exception {
- return SUCCESS;
- }
-}
+ private static final long serialVersionUID = -2749145880590245184L;
+
+ public String show() throws Exception {
+ return SUCCESS;
+ }
+
+ public String doInclude() throws Exception {
+ return SUCCESS;
+ }
+}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/AppendIteratorTagDemo.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.tag.nonui.iteratortag;
@@ -21,57 +24,57 @@
import com.opensymphony.xwork2.Validateable;
/**
- *
+ *
*/
public class AppendIteratorTagDemo extends ActionSupport implements Validateable {
- private static final long serialVersionUID = -6525059998526094664L;
-
- private String iteratorValue1;
- private String iteratorValue2;
-
-
- public void validate() {
- if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
- addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
- }
- else if (iteratorValue1.trim().indexOf(",") <= 0) {
- addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
- }
- if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
- addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
- }
- else if (iteratorValue2.trim().indexOf(",") <= 0) {
- addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
- }
- }
-
-
-
-
- public String getIteratorValue1() {
- return iteratorValue1;
- }
- public void setIteratorValue1(String iteratorValue1) {
- this.iteratorValue1 = iteratorValue1;
- }
-
-
-
- public String getIteratorValue2() {
- return iteratorValue2;
- }
- public void setIteratorValue2(String iteratorValue2) {
- this.iteratorValue2 = iteratorValue2;
- }
-
-
-
- public String input() throws Exception {
- return SUCCESS;
- }
-
- public String submit() throws Exception {
- return SUCCESS;
- }
+ private static final long serialVersionUID = -6525059998526094664L;
+
+ private String iteratorValue1;
+ private String iteratorValue2;
+
+
+ public void validate() {
+ if (iteratorValue1 == null || iteratorValue1.trim().length() <= 0 ) {
+ addFieldError("iteratorValue1", "iterator value 1 cannot be empty");
+ }
+ else if (iteratorValue1.trim().indexOf(",") <= 0) {
+ addFieldError("iteratorValue1", "iterator value 1 needs to be comma separated");
+ }
+ if (iteratorValue2 == null || iteratorValue2.trim().length() <= 0) {
+ addFieldError("iteratorValue2", "iterator value 2 cannot be empty");
+ }
+ else if (iteratorValue2.trim().indexOf(",") <= 0) {
+ addFieldError("iteratorValue2", "iterator value 2 needs to be comma separated");
+ }
+ }
+
+
+
+
+ public String getIteratorValue1() {
+ return iteratorValue1;
+ }
+ public void setIteratorValue1(String iteratorValue1) {
+ this.iteratorValue1 = iteratorValue1;
+ }
+
+
+
+ public String getIteratorValue2() {
+ return iteratorValue2;
+ }
+ public void setIteratorValue2(String iteratorValue2) {
+ this.iteratorValue2 = iteratorValue2;
+ }
+
+
+
+ public String input() throws Exception {
+ return SUCCESS;
+ }
+
+ public String submit() throws Exception {
+ return SUCCESS;
+ }
}
Modified: struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java?view=diff&rev=471756&r1=471755&r2=471756
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java (original)
+++ struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/tag/nonui/iteratortag/IteratorGeneratorTagDemo.java Mon Nov 6 07:01:43 2006
@@ -1,19 +1,22 @@
/*
* $Id$
*
- * Copyright 2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.struts2.showcase.tag.nonui.iteratortag;
@@ -23,44 +26,44 @@
*/
public class IteratorGeneratorTagDemo extends ActionSupport {
- private static final long serialVersionUID = 6893616642389337039L;
-
- private String value;
- private Integer count;
- private String separator;
-
-
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
-
-
- public Integer getCount() {
- return count;
- }
- public void setCount(Integer count) {
- this.count = count;
- }
-
-
-
- public String getSeparator() {
- return this.separator;
- }
- public void setSeparator(String separator) {
- this.separator = separator;
- }
-
-
- public String submit() throws Exception {
- return SUCCESS;
- }
-
-
- public String input() throws Exception {
- return SUCCESS;
- }
+ private static final long serialVersionUID = 6893616642389337039L;
+
+ private String value;
+ private Integer count;
+ private String separator;
+
+
+ public String getValue() {
+ return value;
+ }
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+
+ public Integer getCount() {
+ return count;
+ }
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+
+
+ public String getSeparator() {
+ return this.separator;
+ }
+ public void setSeparator(String separator) {
+ this.separator = separator;
+ }
+
+
+ public String submit() throws Exception {
+ return SUCCESS;
+ }
+
+
+ public String input() throws Exception {
+ return SUCCESS;
+ }
}