You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/11 19:00:08 UTC
svn commit: r655338 [2/5] - in /tapestry/tapestry5/trunk:
tapestry-component-report/src/main/java/org/apache/tapestry/mojo/
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClientPersistenceDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClientPersistenceDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClientPersistenceDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ClientPersistenceDemo.java Sun May 11 10:00:04 2008
@@ -21,29 +21,29 @@
public class ClientPersistenceDemo
{
@Persist("client")
- private Object _persistedValue;
+ private Object persistedValue;
@Inject
- private Request _request;
+ private Request request;
public Object getPersistedValue()
{
- return _persistedValue;
+ return persistedValue;
}
public boolean getSessionExists()
{
- return _request.getSession(false) != null;
+ return request.getSession(false) != null;
}
void onActionFromStoreString()
{
- _persistedValue = "A String";
+ persistedValue = "A String";
}
void onActionFromStoreBad()
{
- _persistedValue = new Runnable()
+ persistedValue = new Runnable()
{
public void run()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ComponentParameter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ComponentParameter.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ComponentParameter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ComponentParameter.java Sun May 11 10:00:04 2008
@@ -19,17 +19,17 @@
public class ComponentParameter
{
@Persist("flash")
- private String _message;
+ private String message;
public String getMessage()
{
- return _message;
+ return message;
}
void onActionFromBlockAction()
{
- _message = "Link was clicked.";
+ message = "Link was clicked.";
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java Sun May 11 10:00:04 2008
@@ -21,18 +21,18 @@
{
@SuppressWarnings("unused")
@Component(parameters =
- {"start=10", "end=1", "value=countValue"})
- private Count _count;
+ { "start=10", "end=1", "value=countValue" })
+ private Count count;
- private int _countValue;
+ private int countValue;
public int getCountValue()
{
- return _countValue;
+ return countValue;
}
public void setCountValue(int countValue)
{
- _countValue = countValue;
+ this.countValue = countValue;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java Sun May 11 10:00:04 2008
@@ -24,20 +24,20 @@
public class DateFieldDemo
{
@Persist
- private Date _birthday;
+ private Date birthday;
@Persist
- private Date _asteroidImpact;
+ private Date asteroidImpact;
@Validate("required")
public Date getBirthday()
{
- return _birthday;
+ return birthday;
}
public void setBirthday(Date birthday)
{
- _birthday = birthday;
+ this.birthday = birthday;
}
public DateFormat getDateFormat()
@@ -48,11 +48,11 @@
@Validate("required")
public Date getAsteroidImpact()
{
- return _asteroidImpact;
+ return asteroidImpact;
}
public void setAsteroidImpact(Date asteroidImpact)
{
- _asteroidImpact = asteroidImpact;
+ this.asteroidImpact = asteroidImpact;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java Sun May 11 10:00:04 2008
@@ -21,7 +21,7 @@
{
@Retain
@Property(write = false)
- private Datum _datum = new Datum();
+ private Datum datum = new Datum();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DeleteFromGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DeleteFromGridDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DeleteFromGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DeleteFromGridDemo.java Sun May 11 10:00:04 2008
@@ -24,13 +24,13 @@
public class DeleteFromGridDemo
{
@Inject
- private ToDoDatabase _database;
+ private ToDoDatabase database;
- private ToDoItem _item;
+ private ToDoItem item;
void onActionFromSetup()
{
- _database.clear();
+ database.clear();
for (int i = 1; i <= 10; i++)
{
@@ -38,24 +38,27 @@
item.setTitle(String.format("ToDo #%d", i));
item.setOrder(i);
- _database.add(item);
+ database.add(item);
}
}
void onActionFromDelete(long id)
{
- _database.remove(id);
+ database.remove(id);
}
- public List<ToDoItem> getItems() { return _database.findAll(); }
+ public List<ToDoItem> getItems()
+ {
+ return database.findAll();
+ }
public ToDoItem getItem()
{
- return _item;
+ return item;
}
public void setItem(ToDoItem item)
{
- _item = item;
+ this.item = item;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DisabledFields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DisabledFields.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DisabledFields.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DisabledFields.java Sun May 11 10:00:04 2008
@@ -23,53 +23,53 @@
public class DisabledFields
{
- private String _stringValue;
+ private String stringValue;
- private boolean _flag;
+ private boolean flag;
- private Date _date;
+ private Date date;
- private List<String> _values;
+ private List<String> values;
@Validate("required")
public String getStringValue()
{
- return _stringValue;
+ return stringValue;
}
public void setStringValue(String stringValue)
{
- _stringValue = stringValue;
+ this.stringValue = stringValue;
}
public boolean isFlag()
{
- return _flag;
+ return flag;
}
public void setFlag(boolean flag)
{
- _flag = flag;
+ this.flag = flag;
}
public Date getDate()
{
- return _date;
+ return date;
}
public void setDate(Date date)
{
- _date = date;
+ this.date = date;
}
public List<String> getValues()
{
- return _values;
+ return values;
}
public void setValues(List<String> values)
{
- _values = values;
+ this.values = values;
}
public ValueEncoder getEncoder()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventMethodTranslate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventMethodTranslate.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventMethodTranslate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventMethodTranslate.java Sun May 11 10:00:04 2008
@@ -20,21 +20,21 @@
public class EventMethodTranslate
{
@Persist
- private int _count;
+ private int count;
public int getCount()
{
- return _count;
+ return count;
}
public void setCount(int count)
{
- _count = count;
+ this.count = count;
}
String onToClientFromCount()
{
- if (_count == 0) return "zero";
+ if (count == 0) return "zero";
// Get the default behavior
return null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ExceptionEventDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ExceptionEventDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ExceptionEventDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ExceptionEventDemo.java Sun May 11 10:00:04 2008
@@ -19,10 +19,10 @@
public class ExceptionEventDemo
{
@Persist("flash")
- private String _message;
+ private String message;
@Persist
- private boolean _intercept = true;
+ private boolean intercept = true;
public Object getInvalidContext()
{
@@ -31,19 +31,19 @@
void onActivate(float context)
{
- _message = "Activation context: " + context;
+ message = "Activation context: " + context;
}
void onActionFromFail(float context)
{
- _message = "Event context: " + context;
+ message = "Event context: " + context;
}
Object onException(Throwable exception)
{
- if (!_intercept) return null;
+ if (!intercept) return null;
- _message = "Exception: " + exception.getMessage();
+ message = "Exception: " + exception.getMessage();
return this;
}
@@ -51,21 +51,21 @@
void onActionFromEnable()
{
- _intercept = true;
+ intercept = true;
}
void onActionFromDisable()
{
- _intercept = false;
+ intercept = false;
}
public String getMessage()
{
- return _message;
+ return message;
}
public boolean isIntercept()
{
- return _intercept;
+ return intercept;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FlashDemo.java Sun May 11 10:00:04 2008
@@ -22,15 +22,15 @@
public class FlashDemo extends BaseComponent
{
@Persist
- private String _message;
+ private String message;
public String getMessage()
{
- return _message;
+ return message;
}
void onAction()
{
- _message = "You clicked the link!";
+ message = "You clicked the link!";
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormEncodingType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormEncodingType.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormEncodingType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormEncodingType.java Sun May 11 10:00:04 2008
@@ -22,7 +22,7 @@
public class FormEncodingType
{
@Environmental
- private FormSupport _support;
+ private FormSupport support;
public Renderable getForceEncodingType()
{
@@ -30,7 +30,7 @@
{
public void render(MarkupWriter writer)
{
- _support.setEncodingType("x-override");
+ support.setEncodingType("x-override");
}
};
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentDemo.java Sun May 11 10:00:04 2008
@@ -23,33 +23,33 @@
public class FormFragmentDemo
{
@Property
- private SubscribeData _subscribe;
+ private SubscribeData subscribe;
@Property
- private boolean _subscribeToEmail;
+ private boolean subscribeToEmail;
@Property
- private boolean _codeVisible;
+ private boolean codeVisible;
@Component
- private Form _form;
+ private Form form;
@InjectPage
- private FormFragmentOutput _outputPage;
+ private FormFragmentOutput outputPage;
public SubscribeData getSubscribe()
{
- return _subscribe;
+ return subscribe;
}
void onPrepare()
{
- _subscribe = new SubscribeData();
+ subscribe = new SubscribeData();
}
void onActionFromClear()
{
- _form.clearErrors();
+ form.clearErrors();
}
Object onFailure()
@@ -59,6 +59,6 @@
Object onSuccess()
{
- return _outputPage.initialize(_subscribe);
+ return outputPage.initialize(subscribe);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentOutput.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentOutput.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentOutput.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormFragmentOutput.java Sun May 11 10:00:04 2008
@@ -20,16 +20,16 @@
public class FormFragmentOutput
{
@Persist
- private SubscribeData _subscribe;
+ private SubscribeData subscribe;
FormFragmentOutput initialize(SubscribeData subscribe)
{
- _subscribe = subscribe;
+ this.subscribe = subscribe;
return this;
}
public SubscribeData getSubscribe()
{
- return _subscribe;
+ return subscribe;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/FormInjectorDemo.java Sun May 11 10:00:04 2008
@@ -24,54 +24,54 @@
public class FormInjectorDemo
{
@Persist
- private double _sum;
+ private double sum;
- private double _value;
+ private double value;
@Inject
- private Block _newRow;
+ private Block newRow;
@Inject
- private PageRenderSupport _pageRenderSupport;
+ private PageRenderSupport pageRenderSupport;
@Component
- private FormInjector _formInjector;
+ private FormInjector formInjector;
public double getSum()
{
- return _sum;
+ return sum;
}
public double getValue()
{
- return _value;
+ return value;
}
public void setValue(double value)
{
- _value = value;
+ this.value = value;
}
void onPrepareForSubmit()
{
- _sum = 0;
+ sum = 0;
}
void onAfterSubmit()
{
- _sum += _value;
+ sum += value;
}
void afterRender()
{
- _pageRenderSupport.addScript(
+ pageRenderSupport.addScript(
"$('addnewrow').observe('click', function() { $('%s').trigger(); return false; });",
- _formInjector.getClientId());
+ formInjector.getClientId());
}
Object onActionFromFormInjector()
{
- return _newRow;
+ return newRow;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java Sun May 11 10:00:04 2008
@@ -25,35 +25,35 @@
public class GridDemo
{
@Inject
- private MusicLibrary _library;
+ private MusicLibrary library;
- private Track _track;
+ private Track track;
@Component
- private Grid _grid;
+ private Grid grid;
public Track getTrack()
{
- return _track;
+ return track;
}
public void setTrack(Track track)
{
- _track = track;
+ this.track = track;
}
public List<Track> getTracks()
{
- return _library.getTracks();
+ return library.getTracks();
}
void onActionFromSortRating()
{
- _grid.getSortModel().updateSort("rating");
+ grid.getSortModel().updateSort("rating");
}
void onActionFromReset()
{
- _grid.reset();
+ grid.reset();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java Sun May 11 10:00:04 2008
@@ -23,15 +23,15 @@
public class GridEnumDemo
{
@Inject
- private ToDoDatabase _database;
+ private ToDoDatabase database;
void onActionFromReset()
{
- _database.reset();
+ database.reset();
}
public ToDoDatabase getDatabase()
{
- return _database;
+ return database;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java Sun May 11 10:00:04 2008
@@ -23,15 +23,15 @@
public class GridFormDemo
{
@Inject
- private ToDoDatabase _database;
+ private ToDoDatabase database;
- private ToDoItem _item;
+ private ToDoItem item;
- private List<ToDoItem> _items;
+ private List<ToDoItem> items;
void onPrepare()
{
- _items = _database.findAll();
+ items = database.findAll();
}
void onSuccess()
@@ -40,28 +40,28 @@
// If we provided our own GridDataSource, we would be able to update just the items
// currently visible. But as is, we have to update each one!
- for (ToDoItem item : _items)
- _database.update(item);
+ for (ToDoItem item : items)
+ database.update(item);
}
public List<ToDoItem> getItems()
{
- return _items;
+ return items;
}
public ToDoItem getItem()
{
- return _item;
+ return item;
}
public void setItem(ToDoItem item)
{
- _item = item;
+ this.item = item;
}
void onActionFromReset()
{
- _database.clear();
+ database.clear();
for (int i = 0; i < 20; i++)
{
@@ -69,7 +69,7 @@
item.setTitle("ToDo # " + (i + 1));
item.setOrder(i);
- _database.add(item);
+ database.add(item);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridSetDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridSetDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridSetDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridSetDemo.java Sun May 11 10:00:04 2008
@@ -24,22 +24,22 @@
public class GridSetDemo
{
@Inject
- private MusicLibrary _library;
+ private MusicLibrary library;
- private Track _track;
+ private Track track;
public Track getTrack()
{
- return _track;
+ return track;
}
public void setTrack(Track track)
{
- _track = track;
+ this.track = track;
}
public Set<Track> getTracks()
{
- return CollectionFactory.newSet(_library.getTracks());
+ return CollectionFactory.newSet(library.getTracks());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/IndirectProtectedFields.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/IndirectProtectedFields.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/IndirectProtectedFields.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/IndirectProtectedFields.java Sun May 11 10:00:04 2008
@@ -19,10 +19,10 @@
public class IndirectProtectedFields
{
@InjectPage
- private ProtectedFields _protectedFields;
+ private ProtectedFields protectedFields;
Object onActionFromGo()
{
- return _protectedFields;
+ return protectedFields;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectContainerMismatch.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectContainerMismatch.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectContainerMismatch.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectContainerMismatch.java Sun May 11 10:00:04 2008
@@ -21,10 +21,9 @@
public class InjectContainerMismatch
{
/**
- * This mixin only works with components of type {@link Field}. That's the mismatch right
- * there.
+ * This mixin only works with components of type {@link Field}. That's the mismatch right there.
*/
@SuppressWarnings("unused")
@Mixin
- private RenderDisabled _renderDisabled;
+ private RenderDisabled renderDisabled;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InjectDemo.java Sun May 11 10:00:04 2008
@@ -29,62 +29,62 @@
// Named --- now demonstrating case insensitivity
// Now vestigial!
@Inject
- private Request _request;
+ private Request request;
@Inject
@Symbol("app.injected-symbol")
- private String _injectedSymbol;
+ private String injectedSymbol;
// Via ComponentResourcesInjectionProvider
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
// Via ??? -- have to ensure that BindingSource
// stays unique.
@Inject
- private BindingSource _bindingSource;
+ private BindingSource bindingSource;
@InjectPage
- private Fred _fred;
+ private Fred fred;
// Again, demonstrates case insensitivity
@InjectPage("barney")
- private Runnable _barney;
+ private Runnable barney;
@Inject
@French
- private Greeter _greeter;
+ private Greeter greeter;
public String getGreeting()
{
- return _greeter.getGreeting();
+ return greeter.getGreeting();
}
public BindingSource getBindingSource()
{
- return _bindingSource;
+ return bindingSource;
}
public Request getRequest()
{
- return _request;
+ return request;
}
public ComponentResources getResources()
{
- return _resources;
+ return resources;
}
@OnEvent(component = "fred")
Object clickFred()
{
- return _fred;
+ return fred;
}
@OnEvent(component = "barney")
Object clickBarney()
{
- return _barney;
+ return barney;
}
@OnEvent(component = "wilma")
@@ -95,6 +95,6 @@
public String getInjectedSymbol()
{
- return _injectedSymbol;
+ return injectedSymbol;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java Sun May 11 10:00:04 2008
@@ -29,34 +29,34 @@
{
@SuppressWarnings("unused")
@Component(parameters =
- {"value=date2", "format=format", "test=showEmphasis"})
+ { "value=date2", "format=format", "test=showEmphasis" })
@Mixins("Emphasis")
- private Output _output2;
+ private Output output2;
@SuppressWarnings("unused")
@Component(parameters =
- {"value=date3", "format=format", "test=showEmphasis"})
+ { "value=date3", "format=format", "test=showEmphasis" })
@MixinClasses(Emphasis.class)
- private Output _output3;
+ private Output output3;
@Retain
- private final Format _format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US);
+ private final Format format = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US);
@Retain
- private final Date _date1 = newDate(99, Calendar.JUNE, 13);
+ private final Date date1 = newDate(99, Calendar.JUNE, 13);
@Retain
- private final Date _date2 = newDate(101, Calendar.JULY, 15);
+ private final Date date2 = newDate(101, Calendar.JULY, 15);
@Retain
- private final Date _date3 = newDate(105, Calendar.DECEMBER, 4);
+ private final Date date3 = newDate(105, Calendar.DECEMBER, 4);
@Persist
- private boolean _showEmphasis;
+ private boolean showEmphasis;
public Format getFormat()
{
- return _format;
+ return format;
}
private static Date newDate(int yearSince1900, int month, int day)
@@ -66,27 +66,27 @@
public Date getDate1()
{
- return _date1;
+ return date1;
}
public Date getDate2()
{
- return _date2;
+ return date2;
}
public Date getDate3()
{
- return _date3;
+ return date3;
}
public boolean getShowEmphasis()
{
- return _showEmphasis;
+ return showEmphasis;
}
@OnEvent(component = "toggle")
void toggle()
{
- _showEmphasis = !_showEmphasis;
+ showEmphasis = !showEmphasis;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java Sun May 11 10:00:04 2008
@@ -19,12 +19,12 @@
public class Kicker
{
@InjectPage
- private Target _target;
+ private Target target;
Object onAction()
{
- _target.setActivationContext(new String[]{"betty", "wilma", "betty/wilma", "\u82B1\u5B50"});
+ target.setActivationContext(new String[] { "betty", "wilma", "betty/wilma", "\u82B1\u5B50" });
- return _target;
+ return target;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ListEventContextDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ListEventContextDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ListEventContextDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ListEventContextDemo.java Sun May 11 10:00:04 2008
@@ -18,15 +18,15 @@
public class ListEventContextDemo
{
- private List _eventContext;
+ private List eventContext;
public List getEventContext()
{
- return _eventContext;
+ return eventContext;
}
void onActivate(List context)
{
- _eventContext = context;
+ eventContext = context;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java Sun May 11 10:00:04 2008
@@ -24,42 +24,42 @@
public class Localization
{
@Inject
- private Messages _messages;
+ private Messages messages;
@Inject
- private Locale _locale;
+ private Locale locale;
@Inject
- private Request _request;
+ private Request request;
@Inject
- private PersistentLocale _persistentLocale;
+ private PersistentLocale persistentLocale;
public Locale getLocale()
{
- return _locale;
+ return locale;
}
public Request getRequest()
{
- return _request;
+ return request;
}
public String getInjectedMessage()
{
- return _messages.get("via-inject");
+ return messages.get("via-inject");
}
public void onActionFromFrench()
{
- _persistentLocale.set(Locale.FRENCH);
+ persistentLocale.set(Locale.FRENCH);
}
public void onActionFromEnglish()
{
- _persistentLocale.set(Locale.ENGLISH);
+ persistentLocale.set(Locale.ENGLISH);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MagicValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MagicValueEncoder.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MagicValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MagicValueEncoder.java Sun May 11 10:00:04 2008
@@ -19,18 +19,18 @@
public class MagicValueEncoder
{
@Persist("flash")
- private int _number;
+ private int number;
- private static final int[] OPTIONS = {5, 10, 25, 100};
+ private static final int[] OPTIONS = { 5, 10, 25, 100 };
public int getNumber()
{
- return _number;
+ return number;
}
public void setNumber(int number)
{
- _number = number;
+ this.number = number;
}
public int[] getOptions()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MethodAdviceDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MethodAdviceDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MethodAdviceDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MethodAdviceDemo.java Sun May 11 10:00:04 2008
@@ -22,18 +22,18 @@
public class MethodAdviceDemo
{
@Persist
- private String _text;
+ private String text;
@Validate("required")
public String getText()
{
- return _text;
+ return text;
}
@ReverseStrings
public void setText(String text)
{
- _text = text;
+ this.text = text;
}
@ReverseStrings
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanDemoResult.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanDemoResult.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanDemoResult.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanDemoResult.java Sun May 11 10:00:04 2008
@@ -21,19 +21,19 @@
public class MultiBeanDemoResult
{
@ApplicationState
- private UserCredentials _credentials;
+ private UserCredentials credentials;
@ApplicationState
- private RolePath _rolePath;
+ private RolePath rolePath;
public UserCredentials getCredentials()
{
- return _credentials;
+ return credentials;
}
public RolePath getRolePath()
{
- return _rolePath;
+ return rolePath;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java Sun May 11 10:00:04 2008
@@ -24,48 +24,48 @@
public class MultiBeanEditDemo
{
@ApplicationState
- private UserCredentials _credentials;
+ private UserCredentials credentials;
@ApplicationState
- private RolePath _rolePath;
+ private RolePath rolePath;
@InjectPage
- private MultiBeanDemoResult _resultPage;
+ private MultiBeanDemoResult resultPage;
@Component
- private Form _form;
+ private Form form;
public UserCredentials getCredentials()
{
- return _credentials;
+ return credentials;
}
public RolePath getRolePath()
{
- return _rolePath;
+ return rolePath;
}
public void setCredentials(UserCredentials credentials)
{
- _credentials = credentials;
+ this.credentials = credentials;
}
public void setRolePath(RolePath rolePath)
{
- _rolePath = rolePath;
+ this.rolePath = rolePath;
}
Object onSuccess()
{
- return _resultPage;
+ return resultPage;
}
void onActionFromClear()
{
// Force these to be re-created.
- _credentials = null;
- _rolePath = null;
+ credentials = null;
+ rolePath = null;
- _form.clearErrors();
+ form.clearErrors();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Music.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Music.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Music.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Music.java Sun May 11 10:00:04 2008
@@ -23,22 +23,22 @@
public class Music
{
@Inject
- private MusicLibrary _library;
+ private MusicLibrary library;
- private Track _track;
+ private Track track;
public List<Track> getTracks()
{
- return _library.getTracks();
+ return library.getTracks();
}
public Track getTrack()
{
- return _track;
+ return track;
}
public void setTrack(Track track)
{
- _track = track;
+ this.track = track;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NullStrategyDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NullStrategyDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NullStrategyDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NullStrategyDemo.java Sun May 11 10:00:04 2008
@@ -19,15 +19,15 @@
public class NullStrategyDemo
{
@Persist
- private Long _number;
+ private Long number;
public Long getNumber()
{
- return _number;
+ return number;
}
public void setNumber(Long number)
{
- _number = number;
+ this.number = number;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanDisplayDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanDisplayDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanDisplayDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanDisplayDemo.java Sun May 11 10:00:04 2008
@@ -20,17 +20,17 @@
public class NumberBeanDisplayDemo
{
@Persist
- private IntegerHolder _holder;
+ private IntegerHolder holder;
Object initialize(IntegerHolder holder)
{
- _holder = holder;
+ this.holder = holder;
return this;
}
public IntegerHolder getHolder()
{
- return _holder;
+ return holder;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberBeanEditorDemo.java Sun May 11 10:00:04 2008
@@ -14,28 +14,28 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.IntegerHolder;
import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.integration.app1.data.IntegerHolder;
public class NumberBeanEditorDemo
{
- private IntegerHolder _holder;
+ private IntegerHolder holder;
@InjectPage
- private NumberBeanDisplayDemo _page;
+ private NumberBeanDisplayDemo page;
public IntegerHolder getHolder()
{
- return _holder;
+ return holder;
}
public void setHolder(IntegerHolder holder)
{
- _holder = holder;
+ this.holder = holder;
}
Object onSuccess()
{
- return _page.initialize(_holder);
+ return page.initialize(holder);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/NumberSelect.java Sun May 11 10:00:04 2008
@@ -18,30 +18,30 @@
public class NumberSelect
{
- private int _index;
+ private int index;
+
+ @InjectPage
+ private ShowSelection showSelection;
public int getIndex()
{
- return _index;
+ return index;
}
public void setIndex(int index)
{
- _index = index;
+ this.index = index;
}
public boolean isNotFirst()
{
- return _index != 1;
+ return index != 1;
}
- @InjectPage
- private ShowSelection _showSelection;
-
Object onActionFromSelect(int index)
{
- _showSelection.setSelected(index);
+ showSelection.setSelected(index);
- return _showSelection;
+ return showSelection;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/OverrideValidationDecorator.java Sun May 11 10:00:04 2008
@@ -23,42 +23,42 @@
public class OverrideValidationDecorator
{
- private String _value;
+ private String value;
- private long _requiredValue;
+ private long requiredValue;
@Inject
- private Environment _environment;
+ private Environment environment;
void beginRender(MarkupWriter writer)
{
- ValidationDecorator existing = _environment.peekRequired(ValidationDecorator.class);
+ ValidationDecorator existing = environment.peekRequired(ValidationDecorator.class);
- _environment.push(ValidationDecorator.class, new ChattyValidationDecorator(writer, existing));
+ environment.push(ValidationDecorator.class, new ChattyValidationDecorator(writer, existing));
}
void afterRender()
{
- _environment.pop(ValidationDecorator.class);
+ environment.pop(ValidationDecorator.class);
}
public String getValue()
{
- return _value;
+ return value;
}
public void setValue(String value)
{
- _value = value;
+ this.value = value;
}
public long getRequiredValue()
{
- return _requiredValue;
+ return requiredValue;
}
public void setRequiredValue(long requiredValue)
{
- _requiredValue = requiredValue;
+ this.requiredValue = requiredValue;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageContextInForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageContextInForm.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageContextInForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageContextInForm.java Sun May 11 10:00:04 2008
@@ -16,39 +16,39 @@
public class PageContextInForm
{
- private Object[] _activationContext;
+ private Object[] activationContext;
- private Object _object;
+ private Object object;
void onActivate(Object[] context)
{
- _activationContext = context;
+ activationContext = context;
}
Object[] onPassivate()
{
- if (_activationContext != null)
+ if (activationContext != null)
{
- return _activationContext;
+ return activationContext;
}
else
{
- return new Object[]{"betty", "wilma", "context with spaces", "context/with/slashes"};
+ return new Object[] { "betty", "wilma", "context with spaces", "context/with/slashes" };
}
}
public Object[] getActivationContext()
{
- return _activationContext;
+ return activationContext;
}
public Object getObject()
{
- return _object;
+ return object;
}
public void setObject(Object object)
{
- _object = object;
+ this.object = object;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java Sun May 11 10:00:04 2008
@@ -20,7 +20,7 @@
public class PageLinkContext
{
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
public Object[] getComputedContext()
{
@@ -39,7 +39,7 @@
Object onActionFromNullContext()
{
- return _resources.createPageLink("target", true, new Object[] { null });
+ return resources.createPageLink("target", true, new Object[] { null });
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLoadedDemo.java Sun May 11 10:00:04 2008
@@ -19,15 +19,15 @@
public class PageLoadedDemo
{
@Retain
- private String _message;
+ private String message;
void pageLoaded()
{
- _message = "pageLoaded() was invoked.";
+ message = "pageLoaded() was invoked.";
}
public String getMessage()
{
- return _message;
+ return message;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java Sun May 11 10:00:04 2008
@@ -28,37 +28,37 @@
public class PaletteDemo
{
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
@Persist
- private List<ProgrammingLanguage> _languages;
+ private List<ProgrammingLanguage> languages;
@Persist
- private boolean _reorder;
+ private boolean reorder;
public boolean isReorder()
{
- return _reorder;
+ return reorder;
}
public void setReorder(boolean reorder)
{
- _reorder = reorder;
+ this.reorder = reorder;
}
public List<ProgrammingLanguage> getLanguages()
{
- return _languages;
+ return languages;
}
public void setLanguages(List<ProgrammingLanguage> selected)
{
- _languages = selected;
+ languages = selected;
}
public SelectModel getLanguageModel()
{
- return new EnumSelectModel(ProgrammingLanguage.class, _resources.getMessages());
+ return new EnumSelectModel(ProgrammingLanguage.class, resources.getMessages());
}
@SuppressWarnings("unchecked")
@@ -69,7 +69,7 @@
void onActionFromReset()
{
- _reorder = false;
- _languages = null;
+ reorder = false;
+ languages = null;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ParameterConflict.java Sun May 11 10:00:04 2008
@@ -1,25 +1,25 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
-// 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
-//
-// 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.
-
+// Copyright 2006, 2007 The Apache Software Foundation
+//
+// 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
+//
+// 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.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.integration.app1.components.Echo;
+import org.apache.tapestry.annotations.Component;
+import org.apache.tapestry.integration.app1.components.Echo;
public class ParameterConflict
{
@SuppressWarnings("unused")
@Component(parameters = "value=literal:ClassValue")
- private Echo _echo;
+ private Echo echo;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PasswordFieldDemo.java Sun May 11 10:00:04 2008
@@ -24,26 +24,26 @@
public class PasswordFieldDemo
{
@Retain
- private String _userName;
+ private String userName;
// Normally not retained, just want to prove that the output value is always the blank string.
@Retain
- private String _password;
+ private String password;
@Inject
- private UserAuthenticator _authenticator;
+ private UserAuthenticator authenticator;
@Component(id = "password")
- private PasswordField _passwordField;
+ private PasswordField passwordField;
@Component
- private Form _form;
+ private Form form;
String onSuccess()
{
- if (!_authenticator.isValid(_userName, _password))
+ if (!authenticator.isValid(userName, password))
{
- _form.recordError(_passwordField, "Invalid user name or password.");
+ form.recordError(passwordField, "Invalid user name or password.");
return null;
}
@@ -52,22 +52,22 @@
public String getPassword()
{
- return _password;
+ return password;
}
public void setPassword(String password)
{
- _password = password;
+ this.password = password;
}
public String getUserName()
{
- return _userName;
+ return userName;
}
public void setUserName(String userName)
{
- _userName = userName;
+ this.userName = userName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PersistentDemo.java Sun May 11 10:00:04 2008
@@ -21,23 +21,23 @@
public class PersistentDemo
{
@Persist
- private String _message;
+ private String message;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
void onActionFromUpdateMessage(String message)
{
- _message = message;
+ this.message = message;
}
void onActionFromDiscardChanges()
{
- _resources.discardPersistentFieldChanges();
+ resources.discardPersistentFieldChanges();
}
public String getMessage()
{
- return _message;
+ return message;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Protected.java Sun May 11 10:00:04 2008
@@ -19,12 +19,12 @@
public class Protected
{
@InjectPage
- private SecurityAlert _alertPage;
+ private SecurityAlert alertPage;
Object onActivate()
{
- _alertPage.setMessage("Access to Protected page is denied.");
+ alertPage.setMessage("Access to Protected page is denied.");
- return _alertPage;
+ return alertPage;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RadioDemo.java Sun May 11 10:00:04 2008
@@ -23,15 +23,15 @@
public class RadioDemo
{
@Persist
- private Department _department;
+ private Department department;
@Persist
- private String _position;
+ private String position;
- private Department _loopValue;
+ private Department loopValue;
@Inject
- private Messages _messages;
+ private Messages messages;
public Department[] getDepartments()
{
@@ -40,36 +40,36 @@
public Department getDepartment()
{
- return _department;
+ return department;
}
public String getPosition()
{
- return _position;
+ return position;
}
public Department getLoopValue()
{
- return _loopValue;
+ return loopValue;
}
public void setDepartment(Department department)
{
- _department = department;
+ this.department = department;
}
public void setPosition(String position)
{
- _position = position;
+ this.position = position;
}
public void setLoopValue(Department loopValue)
{
- _loopValue = loopValue;
+ this.loopValue = loopValue;
}
public String getLabel()
{
- return TapestryInternalUtils.getLabelForEnum(_messages, _loopValue);
+ return TapestryInternalUtils.getLabelForEnum(messages, loopValue);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RegexpDemo.java Sun May 11 10:00:04 2008
@@ -20,17 +20,17 @@
public class RegexpDemo
{
@Persist
- private String _zipCode;
+ private String zipCode;
// regexp requires a constraint, that'll come from the message catalog
@Validate("required,regexp")
public String getZipCode()
{
- return _zipCode;
+ return zipCode;
}
public void setZipCode(String zipCode)
{
- _zipCode = zipCode;
+ this.zipCode = zipCode;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/RenderComponentDemo.java Sun May 11 10:00:04 2008
@@ -21,23 +21,23 @@
public class RenderComponentDemo
{
@Persist
- private boolean _enabled;
+ private boolean enabled;
@Inject
- private Block _optional;
+ private Block optional;
public boolean isEnabled()
{
- return _enabled;
+ return enabled;
}
public void setEnabled(boolean enable)
{
- _enabled = enable;
+ enabled = enable;
}
public Object getThing()
{
- return _enabled ? _optional : null;
+ return enabled ? optional : null;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java Sun May 11 10:00:04 2008
@@ -1,17 +1,17 @@
-// Copyright 2007, 2008 The Apache Software Foundation
-//
-// 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
-//
-// 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.
-
+// Copyright 2007, 2008 The Apache Software Foundation
+//
+// 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
+//
+// 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.tapestry.integration.app1.pages;
import org.apache.tapestry.ComponentResources;
@@ -31,10 +31,10 @@
public class ReturnTypes
{
@InjectPage
- private Start _start;
+ private Start start;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
Object onActionFromNullReturnValue()
{
@@ -53,12 +53,12 @@
Object onActionFromPageReturnValue()
{
- return _start;
+ return start;
}
Object onActionFromLinkReturnValue()
{
- return _resources.createPageLink("start", false);
+ return resources.createPageLink("start", false);
}
Object onActionFromStreamReturnValue()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurePage.java Sun May 11 10:00:04 2008
@@ -26,47 +26,47 @@
{
@Persist("flash")
- private String _message;
+ private String message;
@Inject
- private Request _request;
+ private Request request;
@Inject
@Path("context:images/tapestry_banner.gif")
- private Asset _icon;
+ private Asset icon;
@Inject
@Path("nested/tapestry-button.png")
- private Asset _button;
+ private Asset button;
public Asset getIcon()
{
- return _icon;
+ return icon;
}
public Asset getButton()
{
- return _button;
+ return button;
}
public String getMessage()
{
- return _message;
+ return message;
}
void onActionFromSecureLink()
{
- _message = "Link clicked";
+ message = "Link clicked";
}
void onSubmit()
{
- _message = "Form submitted";
+ message = "Form submitted";
}
SecurePage initialize(String message)
{
- _message = message;
+ this.message = message;
return this;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SecurityAlert.java Sun May 11 10:00:04 2008
@@ -19,16 +19,16 @@
public class SecurityAlert
{
@Persist("flash")
- private String _message;
+ private String message;
public String getMessage()
{
- return _message;
+ return message;
}
public void setMessage(String mesasge)
{
- _message = mesasge;
+ message = mesasge;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowBirthdayReminder.java Sun May 11 10:00:04 2008
@@ -20,10 +20,10 @@
public class ShowBirthdayReminder
{
@ApplicationState
- private BirthdayReminder _reminder;
+ private BirthdayReminder reminder;
public BirthdayReminder getReminder()
{
- return _reminder;
+ return reminder;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ShowSelection.java Sun May 11 10:00:04 2008
@@ -18,27 +18,27 @@
public class ShowSelection
{
- private int _selected;
+ private int selected;
public int getSelected()
{
- return _selected;
+ return selected;
}
public void setSelected(int selected)
{
- _selected = selected;
+ this.selected = selected;
}
@OnEvent("passivate")
int passivate()
{
- return _selected;
+ return selected;
}
@OnEvent("activate")
void activate(int selected)
{
- _selected = selected;
+ this.selected = selected;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleForm.java Sun May 11 10:00:04 2008
@@ -20,33 +20,33 @@
public class SimpleForm
{
@Persist
- private IncidentData _incident;
+ private IncidentData incident;
@Persist
- private boolean _disabled;
+ private boolean disabled;
public boolean isDisabled()
{
- return _disabled;
+ return disabled;
}
public void setDisabled(boolean disable)
{
- _disabled = disable;
+ disabled = disable;
}
public IncidentData getIncident()
{
- return _incident;
+ return incident;
}
void onPrepare()
{
- if (_incident == null)
+ if (incident == null)
{
- _incident = new IncidentData();
- _incident.setUrgent(true);
- _incident.setOperatingSystem("osx");
+ incident = new IncidentData();
+ incident.setUrgent(true);
+ incident.setOperatingSystem("osx");
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java Sun May 11 10:00:04 2008
@@ -27,33 +27,33 @@
public class SimpleTrackGridDemo
{
@Inject
- private MusicLibrary _library;
+ private MusicLibrary library;
@Inject
- private BeanModelSource _beanModelSource;
+ private BeanModelSource beanModelSource;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
- private SimpleTrack _track;
+ private SimpleTrack track;
public SimpleTrack getTrack()
{
- return _track;
+ return track;
}
public void setTrack(SimpleTrack track)
{
- _track = track;
+ this.track = track;
}
public List<Track> getTracks()
{
- return _library.getTracks();
+ return library.getTracks();
}
public BeanModel getSimpleTrackModel()
{
- return _beanModelSource.create(SimpleTrack.class, false, _resources);
+ return beanModelSource.create(SimpleTrack.class, false, resources);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Start.java Sun May 11 10:00:04 2008
@@ -28,35 +28,35 @@
{
public static class Item implements Comparable<Item>
{
- private final String _pageName;
- private final String _label;
- private final String _description;
+ private final String pageName;
+ private final String label;
+ private final String description;
public Item(String pageName, String label, String description)
{
- _pageName = pageName;
- _label = label;
- _description = description;
+ this.pageName = pageName;
+ this.label = label;
+ this.description = description;
}
public String getPageName()
{
- return _pageName;
+ return pageName;
}
public String getLabel()
{
- return _label;
+ return label;
}
public String getDescription()
{
- return _description;
+ return description;
}
public int compareTo(Item o)
{
- return _label.compareTo(o._label);
+ return label.compareTo(o.label);
}
}
@@ -269,7 +269,10 @@
Collections.sort(ITEMS);
}
- private Item _item;
+ private Item item;
+
+ @InjectPage
+ private SecurePage securePage;
public List<Item> getItems()
{
@@ -278,20 +281,17 @@
public Item getItem()
{
- return _item;
+ return item;
}
public void setItem(Item item)
{
- _item = item;
+ this.item = item;
}
- @InjectPage
- private SecurePage _securePage;
-
Object onActionFromSecurePage()
{
- return _securePage.initialize("Triggered from Start");
+ return securePage.initialize("Triggered from Start");
}
public List getDemoContext()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java Sun May 11 10:00:04 2008
@@ -19,47 +19,47 @@
public class Target
{
- private Object[] _activationContext;
+ private Object[] activationContext;
@Persist("flash")
- private Object[] _componentContext;
+ private Object[] componentContext;
- private Object _object;
+ private Object object;
@OnEvent("passivate")
public Object[] getActivationContext()
{
- return _activationContext;
+ return activationContext;
}
public Object[] getComponentContext()
{
- return _componentContext;
+ return componentContext;
}
@OnEvent("activate")
public void setActivationContext(Object[] activationContext)
{
- _activationContext = activationContext;
+ this.activationContext = activationContext;
}
void onAction(Object[] componentContext)
{
- _componentContext = componentContext;
+ this.componentContext = componentContext;
}
public Object[] getContextToEncode()
{
- return new Object[]{"fred", "barney", "clark kent", "fred/barney", "\u592A\u90CE"};
+ return new Object[] { "fred", "barney", "clark kent", "fred/barney", "\u592A\u90CE" };
}
public Object getObject()
{
- return _object;
+ return object;
}
public void setObject(Object object)
{
- _object = object;
+ this.object = object;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/TextFieldWrapperTypeDemo.java Sun May 11 10:00:04 2008
@@ -19,19 +19,25 @@
public class TextFieldWrapperTypeDemo
{
@Persist
- private Integer _count;
+ private Integer count;
public Integer getCount()
{
- return _count;
+ return count;
}
public void setCount(Integer count)
{
- _count = count;
+ this.count = count;
}
- public boolean isCountNull() { return _count == null; }
+ public boolean isCountNull()
+ {
+ return count == null;
+ }
- void onActionFromClear() { _count = null; }
+ void onActionFromClear()
+ {
+ count = null;
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java Sun May 11 10:00:04 2008
@@ -27,49 +27,49 @@
public class ToDoList
{
@Inject
- private ToDoDatabase _database;
+ private ToDoDatabase database;
- private ToDoItem _item;
+ private ToDoItem item;
- private DefaultPrimaryKeyEncoder<Long, ToDoItem> _encoder;
+ private DefaultPrimaryKeyEncoder<Long, ToDoItem> encoder;
@Component
- private Form _form;
+ private Form form;
public List<ToDoItem> getItems()
{
- return _encoder.getValues();
+ return encoder.getValues();
}
public ToDoItem getItem()
{
- return _item;
+ return item;
}
public void setItem(ToDoItem item)
{
- _item = item;
+ this.item = item;
}
public ToDoDatabase getDatabase()
{
- return _database;
+ return database;
}
public PrimaryKeyEncoder getEncoder()
{
- return _encoder;
+ return encoder;
}
void onPrepare()
{
- List<ToDoItem> items = _database.findAll();
+ List<ToDoItem> items = database.findAll();
- _encoder = new DefaultPrimaryKeyEncoder<Long, ToDoItem>();
+ encoder = new DefaultPrimaryKeyEncoder<Long, ToDoItem>();
for (ToDoItem item : items)
{
- _encoder.add(item.getId(), item);
+ encoder.add(item.getId(), item);
}
}
@@ -77,27 +77,27 @@
{
int order = 0;
- for (ToDoItem item : _encoder.getValues())
+ for (ToDoItem item : encoder.getValues())
{
item.setOrder(order++);
- _database.update(item);
+ database.update(item);
}
}
void onSelectedFromAddNew()
{
- if (_form.isValid())
+ if (form.isValid())
{
ToDoItem item = new ToDoItem();
item.setTitle("<New To Do>");
- item.setOrder(_encoder.getValues().size());
+ item.setOrder(encoder.getValues().size());
- _database.add(item);
+ database.add(item);
}
}
void onActionFromReset()
{
- _database.reset();
+ database.reset();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java?rev=655338&r1=655337&r2=655338&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java Sun May 11 10:00:04 2008
@@ -25,65 +25,65 @@
public class ToDoListVolatile
{
@Inject
- private ToDoDatabase _database;
+ private ToDoDatabase database;
- private ToDoItem _item;
+ private ToDoItem item;
- private List<ToDoItem> _items;
+ private List<ToDoItem> items;
@Component
- private Form _form;
+ private Form form;
public List<ToDoItem> getItems()
{
- return _items;
+ return items;
}
public ToDoItem getItem()
{
- return _item;
+ return item;
}
public void setItem(ToDoItem item)
{
- _item = item;
+ this.item = item;
}
public ToDoDatabase getDatabase()
{
- return _database;
+ return database;
}
void onPrepare()
{
- _items = _database.findAll();
+ items = database.findAll();
}
void onSuccess()
{
int order = 0;
- for (ToDoItem item : _items)
+ for (ToDoItem item : items)
{
item.setOrder(order++);
- _database.update(item);
+ database.update(item);
}
}
void onSelectedFromAddNew()
{
- if (_form.isValid())
+ if (form.isValid())
{
ToDoItem item = new ToDoItem();
item.setTitle("<New To Do>");
- item.setOrder(_items.size());
+ item.setOrder(items.size());
- _database.add(item);
+ database.add(item);
}
}
void onActionFromReset()
{
- _database.reset();
+ database.reset();
}
}