You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/05/09 13:09:53 UTC
cvs commit: jakarta-turbine-2/src/test/org/apache/turbine/modules/scheduledjob SimpleJob.java
henning 2003/05/09 04:09:53
Modified: src/java/org/apache/turbine/services/intake/model
FileItemField.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
src/java/org/apache/turbine/services/schedule
TurbineNonPersistentSchedulerService.java
TurbineSchedulerService.java
src/java/org/apache/turbine/services/upload
TurbineUpload.java
src/java/org/apache/turbine/util/parser
DefaultParameterParser.java
src/test/org/apache/turbine/modules/scheduledjob
SimpleJob.java
Log:
An assorted number of style fixes, javadoc updates, typos and empty
line removal without any real code changes.
Revision Changes Path
1.12 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java
Index: FileItemField.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FileItemField.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FileItemField.java 11 Apr 2003 13:15:10 -0000 1.11
+++ FileItemField.java 9 May 2003 11:09:52 -0000 1.12
@@ -61,8 +61,8 @@
import org.apache.turbine.services.intake.validator.ValidationException;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
import org.apache.turbine.util.TurbineRuntimeException;
-import org.apache.turbine.util.parser.ValueParser;
import org.apache.turbine.util.parser.ParameterParser;
+import org.apache.turbine.util.parser.ValueParser;
/**
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
1.16 +4 -4 jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultTurbineRunData.java 22 Apr 2003 13:41:02 -0000 1.15
+++ DefaultTurbineRunData.java 9 May 2003 11:09:52 -0000 1.16
@@ -1433,17 +1433,17 @@
}
/**
- * Sets the servlet session inforamtion.
+ * Sets the servlet session information.
*
* @param sess a session.
- * @deprecated No replacement. This method no longer does anything.
+ * @deprecated No replacement. This method no longer does anything.
*/
public void setSession(HttpSession sess)
{
}
/**
- * Setsthe servlet configuration used during servlet init.
+ * Sets the servlet configuration used during servlet init.
*
* @param config a configuration.
*/
1.16 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TurbineNonPersistentSchedulerService.java 18 Apr 2003 17:41:22 -0000 1.15
+++ TurbineNonPersistentSchedulerService.java 9 May 2003 11:09:53 -0000 1.16
@@ -66,7 +66,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.util.TurbineException;
1.14 +20 -10 jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TurbineSchedulerService.java 18 Apr 2003 13:05:27 -0000 1.13
+++ TurbineSchedulerService.java 9 May 2003 11:09:53 -0000 1.14
@@ -76,7 +76,9 @@
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
* @version $Id$
*/
-public class TurbineSchedulerService extends TurbineBaseService implements ScheduleService
+public class TurbineSchedulerService
+ extends TurbineBaseService
+ implements ScheduleService
{
/** Logging */
private static Log log = LogFactory.getLog(ScheduleService.LOGGER_NAME);
@@ -108,7 +110,8 @@
* @throws InitializationException Something went wrong in the init
* stage
*/
- public void init() throws InitializationException
+ public void init()
+ throws InitializationException
{
try
{
@@ -180,7 +183,8 @@
* @return A JobEntry.
* @exception TurbineException job could not be retreived.
*/
- public JobEntry getJob(int oid) throws TurbineException
+ public JobEntry getJob(int oid)
+ throws TurbineException
{
try
{
@@ -201,7 +205,8 @@
* @param je A JobEntry with the job to add.
* @throws TurbineException job could not be added
*/
- public void addJob(JobEntry je) throws TurbineException
+ public void addJob(JobEntry je)
+ throws TurbineException
{
updateJob(je);
}
@@ -212,7 +217,8 @@
* @param je A JobEntry with the job to remove.
* @exception TurbineException job could not be removed
*/
- public void removeJob(JobEntry je) throws TurbineException
+ public void removeJob(JobEntry je)
+ throws TurbineException
{
try
{
@@ -240,7 +246,8 @@
* @param je A JobEntry with the job to modify
* @throws TurbineException job could not be updated
*/
- public void updateJob(JobEntry je) throws TurbineException
+ public void updateJob(JobEntry je)
+ throws TurbineException
{
try
{
@@ -380,7 +387,8 @@
* @return A JobEntry.
* @exception TurbineException a generic exception.
*/
- private synchronized JobEntry nextJob() throws TurbineException
+ private synchronized JobEntry nextJob()
+ throws TurbineException
{
try
{
@@ -415,7 +423,8 @@
}
}
catch (InterruptedException ex)
- {}
+ {
+ }
// On interrupt.
return null;
@@ -426,7 +435,8 @@
* so that the main class need not implement Runnable, which would
* allow others to directly invoke run, which is not supported.
*/
- protected class MainLoop implements Runnable
+ protected class MainLoop
+ implements Runnable
{
/**
* Method to run the class.
1.9 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/upload/TurbineUpload.java
Index: TurbineUpload.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/upload/TurbineUpload.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TurbineUpload.java 11 Apr 2003 13:15:10 -0000 1.8
+++ TurbineUpload.java 9 May 2003 11:09:53 -0000 1.9
@@ -58,7 +58,6 @@
import org.apache.turbine.services.InstantiationException;
import org.apache.turbine.services.TurbineServices;
-
import org.apache.turbine.util.TurbineException;
import org.apache.turbine.util.parser.ParameterParser;
1.20 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultParameterParser.java 11 Apr 2003 13:15:11 -0000 1.19
+++ DefaultParameterParser.java 9 May 2003 11:09:53 -0000 1.20
@@ -73,7 +73,6 @@
import org.apache.turbine.services.upload.UploadService;
import org.apache.turbine.util.TurbineException;
-import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.pool.Recyclable;
/**
1.4 +12 -6 jakarta-turbine-2/src/test/org/apache/turbine/modules/scheduledjob/SimpleJob.java
Index: SimpleJob.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/modules/scheduledjob/SimpleJob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleJob.java 18 Apr 2003 17:47:49 -0000 1.3
+++ SimpleJob.java 9 May 2003 11:09:53 -0000 1.4
@@ -66,9 +66,12 @@
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
* @version $Id$
*/
-public class SimpleJob extends ScheduledJob
+public class SimpleJob
+ extends ScheduledJob
{
- private static int counter=0;
+ /** The test counter */
+ private static int counter = 0;
+
/**
* Run the Jobentry from the scheduler queue.
*
@@ -83,7 +86,9 @@
}
/**
- * @return
+ * Returns the counter value.
+ *
+ * @return The counter value
*/
public static int getCounter()
{
@@ -91,11 +96,12 @@
}
/**
- * @param i
+ * Sets the counter.
+ *
+ * @param i The new counter value
*/
public static void setCounter(int i)
{
counter = i;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org