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 2004/08/14 22:11:44 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/parser DataStreamParser.java
henning 2004/08/14 13:11:44
Modified: src/java/org/apache/turbine/modules/pages Tag:
TURBINE_2_3_BRANCH TemplatePage.java
src/java/org/apache/turbine/modules/screens Tag:
TURBINE_2_3_BRANCH BaseJspScreen.java
VelocityDirectScreen.java VelocityScreen.java
src/java/org/apache/turbine/services/security/torque Tag:
TURBINE_2_3_BRANCH TorqueUserManager.java
src/java/org/apache/turbine/services/xmlrpc/util Tag:
TURBINE_2_3_BRANCH AuthenticatedFileHandler.java
FileHandler.java
src/java/org/apache/turbine/util Tag: TURBINE_2_3_BRANCH
TimeSelector.java
src/java/org/apache/turbine/util/parser Tag:
TURBINE_2_3_BRANCH DataStreamParser.java
Log:
Removed a few warnings from Eclipse (unneccessary imports, accessing static
fields in non static way etc...)
Revision Changes Path
No revision
No revision
1.5.2.3 +1 -4 jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- TemplatePage.java 20 May 2004 03:03:53 -0000 1.5.2.2
+++ TemplatePage.java 14 Aug 2004 20:11:41 -0000 1.5.2.3
@@ -16,10 +16,7 @@
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-
import org.apache.turbine.services.template.TurbineTemplate;
-
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineException;
No revision
No revision
1.6.2.3 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java
Index: BaseJspScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/BaseJspScreen.java,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- BaseJspScreen.java 20 May 2004 03:03:54 -0000 1.6.2.2
+++ BaseJspScreen.java 14 Aug 2004 20:11:41 -0000 1.6.2.3
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.apache.commons.logging.Log;
-
import org.apache.commons.lang.StringUtils;
import org.apache.ecs.ConcreteElement;
1.11.2.3 +3 -5 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
Index: VelocityDirectScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- VelocityDirectScreen.java 20 May 2004 03:03:54 -0000 1.11.2.2
+++ VelocityDirectScreen.java 14 Aug 2004 20:11:41 -0000 1.11.2.3
@@ -19,17 +19,15 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-
import org.apache.ecs.ConcreteElement;
+import org.apache.velocity.context.Context;
+
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
-
-import org.apache.velocity.context.Context;
/**
* VelocityDirectScreen is a screen class which returns its output
1.9.2.3 +3 -9 jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityScreen.java
Index: VelocityScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityScreen.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- VelocityScreen.java 20 May 2004 03:03:54 -0000 1.9.2.2
+++ VelocityScreen.java 14 Aug 2004 20:11:41 -0000 1.9.2.3
@@ -17,24 +17,18 @@
*/
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.lang.exception.ExceptionUtils;
-import org.apache.commons.logging.Log;
-
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
+import org.apache.velocity.context.Context;
+
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.services.template.TurbineTemplate;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-
import org.apache.turbine.util.RunData;
-
-import org.apache.velocity.context.Context;
/**
* Base Velocity Screen. The buildTemplate() assumes the template
No revision
No revision
1.3.2.3 +1 -6 jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/Attic/TorqueUserManager.java
Index: TorqueUserManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/torque/Attic/TorqueUserManager.java,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- TorqueUserManager.java 20 May 2004 03:06:50 -0000 1.3.2.2
+++ TorqueUserManager.java 14 Aug 2004 20:11:41 -0000 1.3.2.3
@@ -302,11 +302,6 @@
{
return;
}
- //
- // Quinton did some more magic here in the DBSecurityService
- // but I don't think this is necessary, because our Peer will
- // do all the grunt work for us. Maybe: FIXME -- henning
- //
store(user);
}
No revision
No revision
1.8.2.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java
Index: AuthenticatedFileHandler.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/AuthenticatedFileHandler.java,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- AuthenticatedFileHandler.java 20 May 2004 03:06:49 -0000 1.8.2.2
+++ AuthenticatedFileHandler.java 14 Aug 2004 20:11:41 -0000 1.8.2.3
@@ -80,7 +80,7 @@
if (method.equals("remove"))
{
- this.remove((String) params.elementAt(0),
+ AuthenticatedFileHandler.remove((String) params.elementAt(0),
(String) params.elementAt(1));
obj = new Boolean("true");
}
1.11.2.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/FileHandler.java
Index: FileHandler.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/xmlrpc/util/FileHandler.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- FileHandler.java 20 May 2004 03:06:49 -0000 1.11.2.2
+++ FileHandler.java 14 Aug 2004 20:11:41 -0000 1.11.2.3
@@ -179,7 +179,7 @@
StringBuffer sb = new StringBuffer();
sb.append(location);
- sb.append(tmpF.separator);
+ sb.append(File.separator);
sb.append(fileName);
String file = TurbineServlet.getRealPath(sb.toString());
No revision
No revision
1.4.2.3 +2 -2 jakarta-turbine-2/src/java/org/apache/turbine/util/TimeSelector.java
Index: TimeSelector.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/TimeSelector.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- TimeSelector.java 20 May 2004 03:16:38 -0000 1.4.2.2
+++ TimeSelector.java 14 Aug 2004 20:11:42 -0000 1.4.2.3
@@ -628,7 +628,7 @@
if (this.showSeconds == true)
ec.addElement(":");
ec.addElement(secondSelect);
- if (this.timeFormat == this.TWELVE_HOUR)
+ if (this.timeFormat == TimeSelector.TWELVE_HOUR)
{
ec.addElement(ampmSelect);
}
No revision
No revision
1.1.2.3 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DataStreamParser.java
Index: DataStreamParser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DataStreamParser.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DataStreamParser.java 20 May 2004 03:33:43 -0000 1.1.2.2
+++ DataStreamParser.java 14 Aug 2004 20:11:43 -0000 1.1.2.3
@@ -193,10 +193,10 @@
neverRead = false;
tokenizer.nextToken();
- while (tokenizer.ttype == tokenizer.TT_WORD || tokenizer.ttype == tokenizer.TT_EOL
+ while (tokenizer.ttype == StreamTokenizer.TT_WORD || tokenizer.ttype == StreamTokenizer.TT_EOL
|| tokenizer.ttype == '"' || tokenizer.ttype == fieldSeparator)
{
- if (tokenizer.ttype != fieldSeparator && tokenizer.ttype != tokenizer.TT_EOL)
+ if (tokenizer.ttype != fieldSeparator && tokenizer.ttype != StreamTokenizer.TT_EOL)
{
columnNames.add(tokenizer.sval);
fieldCounter++;
@@ -207,12 +207,12 @@
columnNames.add(EMPTYFIELDNAME + fieldCounter);
fieldCounter++;
}
- else if (lastTtype == fieldSeparator && tokenizer.ttype == tokenizer.TT_EOL)
+ else if (lastTtype == fieldSeparator && tokenizer.ttype == StreamTokenizer.TT_EOL)
{
columnNames.add(EMPTYFIELDNAME + fieldCounter);
break;
}
- else if (tokenizer.ttype == tokenizer.TT_EOL)
+ else if (tokenizer.ttype == StreamTokenizer.TT_EOL)
{
break;
}
@@ -294,7 +294,7 @@
{
lineValues.add(colname, tokenizer.sval);
}
- else if (tokenizer.ttype == tokenizer.TT_EOL)
+ else if (tokenizer.ttype == StreamTokenizer.TT_EOL)
{
tokenizer.pushBack();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org