You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/10/15 18:53:11 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/security SecurityInfo.java
jmcnally 01/10/15 09:53:11
Modified: src/java/org/apache/torque/oid IdGenerator.java
src/java/org/apache/torque/adapter IDMethod.java
src/java/org/apache/torque/engine/database/model
NameGenerator.java
src/java/org/apache/torque/map MapBuilder.java
src/java/org/apache/torque/om Persistent.java
Retrievable.java Retriever.java
RetrieverFactory.java SecurePersistent.java
UnsecurePersistent.java
src/java/org/apache/torque/security SecurityInfo.java
Log:
remove redundant modifiers as per Peter Donald's patch.
Revision Changes Path
1.4 +9 -9 jakarta-turbine-torque/src/java/org/apache/torque/oid/IdGenerator.java
Index: IdGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/oid/IdGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IdGenerator.java 2001/08/13 20:59:40 1.3
+++ IdGenerator.java 2001/10/15 16:53:10 1.4
@@ -67,7 +67,7 @@
* Connection pool service only when needed.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: IdGenerator.java,v 1.3 2001/08/13 20:59:40 dlr Exp $
+ * @version $Id: IdGenerator.java,v 1.4 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface IdGenerator
{
@@ -79,7 +79,7 @@
* @return An int with the value for the id.
* @exception Exception Database error.
*/
- public int getIdAsInt(Connection connection, Object keyInfo)
+ int getIdAsInt(Connection connection, Object keyInfo)
throws Exception;
/**
@@ -90,7 +90,7 @@
* @return A long with the value for the id.
* @exception Exception Database error.
*/
- public long getIdAsLong(Connection connection, Object keyInfo)
+ long getIdAsLong(Connection connection, Object keyInfo)
throws Exception;
/**
@@ -101,8 +101,8 @@
* @return A BigDecimal id.
* @exception Exception Database error.
*/
- public BigDecimal getIdAsBigDecimal(Connection connection,
- Object keyInfo)
+ BigDecimal getIdAsBigDecimal(Connection connection,
+ Object keyInfo)
throws Exception;
/**
@@ -113,7 +113,7 @@
* @return A String id
* @exception Exception Database error.
*/
- public String getIdAsString(Connection connection, Object keyInfo)
+ String getIdAsString(Connection connection, Object keyInfo)
throws Exception;
/**
@@ -121,14 +121,14 @@
*
* @return a <code>boolean</code> value
*/
- public boolean isPriorToInsert();
+ boolean isPriorToInsert();
/**
* A flag to determine the timing of the id generation
*
* @return a <code>boolean</code> value
*/
- public boolean isPostInsert();
+ boolean isPostInsert();
/**
* A flag to determine whether a Connection is required to
@@ -136,5 +136,5 @@
*
* @return a <code>boolean</code> value
*/
- public boolean isConnectionRequired();
+ boolean isConnectionRequired();
}
1.2 +6 -6 jakarta-turbine-torque/src/java/org/apache/torque/adapter/IDMethod.java
Index: IDMethod.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/IDMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IDMethod.java 2001/08/13 22:24:10 1.1
+++ IDMethod.java 2001/10/15 16:53:10 1.2
@@ -59,7 +59,7 @@
* (i.e. auto-increment, sequence, ID broker, etc.).
*
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: IDMethod.java,v 1.1 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: IDMethod.java,v 1.2 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface IDMethod
{
@@ -67,26 +67,26 @@
* Key generation via database-specific ID method
* (i.e. auto-increment for MySQL, sequence for Oracle, etc.).
*/
- public static final String NATIVE = "native";
+ String NATIVE = "native";
/**
* Key generation via auto-increment.
*/
- public static final String AUTO_INCREMENT = "autoincrement";
+ String AUTO_INCREMENT = "autoincrement";
/**
* Key generation via sequences.
*/
- public static final String SEQUENCE = "sequence";
+ String SEQUENCE = "sequence";
/**
* Key generation via the IDBroker table.
*/
- public static final String ID_BROKER = "idbroker_table";
+ String ID_BROKER = "idbroker_table";
/**
* No RDBMS key generation (keys may be generated by the
* application).
*/
- public static final String NO_ID_METHOD = "none";
+ String NO_ID_METHOD = "none";
}
1.7 +6 -6 jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/NameGenerator.java
Index: NameGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/model/NameGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NameGenerator.java 2001/09/16 19:00:28 1.6
+++ NameGenerator.java 2001/10/15 16:53:10 1.7
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:dlr@finemaltcoding.com>Daniel Rall</a>
* @author <a href="mailto:byron_foster@byron_foster@yahoo.com>Byron Foster</a>
- * @version $Id: NameGenerator.java,v 1.6 2001/09/16 19:00:28 dlr Exp $
+ * @version $Id: NameGenerator.java,v 1.7 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface NameGenerator
{
@@ -71,7 +71,7 @@
* The character used by most implementations as the separator
* between name elements.
*/
- public static final char STD_SEPARATOR_CHAR = '_';
+ char STD_SEPARATOR_CHAR = '_';
/**
* Traditional method for converting schema table and column names
@@ -81,7 +81,7 @@
*
* @see JavaNameGenerator#underscoreMethod(String)
*/
- public static final String CONV_METHOD_UNDERSCORE = "underscore";
+ String CONV_METHOD_UNDERSCORE = "underscore";
/**
* Similar to {@link #CONV_METHOD_UNDERSCORE} except nothing is
@@ -89,13 +89,13 @@
*
* @see JavaNameGenerator#javanameMethod(String)
*/
- public static final String CONV_METHOD_JAVANAME = "javaname";
+ String CONV_METHOD_JAVANAME = "javaname";
/**
* Specifies no modification when converting from a schema column
* or table name to a java name.
*/
- public static final String CONV_METHOD_NOCHANGE = "nochange";
+ String CONV_METHOD_NOCHANGE = "nochange";
/**
* Given a list of <code>String</code> objects, implements an
@@ -104,6 +104,6 @@
* @param inputs Inputs used to generate a name.
* @return The generated name.
*/
- public String generateName(List inputs)
+ String generateName(List inputs)
throws TorqueException;
}
1.5 +4 -4 jakarta-turbine-torque/src/java/org/apache/torque/map/MapBuilder.java
Index: MapBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/map/MapBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MapBuilder.java 2001/09/20 00:06:27 1.4
+++ MapBuilder.java 2001/10/15 16:53:10 1.5
@@ -61,7 +61,7 @@
* casting.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: MapBuilder.java,v 1.4 2001/09/20 00:06:27 jon Exp $
+ * @version $Id: MapBuilder.java,v 1.5 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface MapBuilder
{
@@ -70,7 +70,7 @@
*
* @exception Exception Couldn't build mapping.
*/
- public abstract void doBuild()
+ void doBuild()
throws Exception;
/**
@@ -79,12 +79,12 @@
*
* @return Whether the DatabaseMap is built.
*/
- public abstract boolean isBuilt();
+ boolean isBuilt();
/**
* Gets the database mapping this map builder built.
*
* @return A DatabaseMap.
*/
- public abstract DatabaseMap getDatabaseMap();
+ DatabaseMap getDatabaseMap();
}
1.7 +9 -8 jakarta-turbine-torque/src/java/org/apache/torque/om/Persistent.java
Index: Persistent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/Persistent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Persistent.java 2001/09/20 00:06:27 1.6
+++ Persistent.java 2001/10/15 16:53:10 1.7
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:fedor@apache.org">Fedor K.</a>
- * @version $Id: Persistent.java,v 1.6 2001/09/20 00:06:27 jon Exp $
+ * @version $Id: Persistent.java,v 1.7 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface Persistent
{
@@ -70,7 +70,7 @@
*
* @return the object primaryKey as an Object
*/
- public ObjectKey getPrimaryKey();
+ ObjectKey getPrimaryKey();
/**
* Sets the PrimaryKey for the object.
@@ -78,7 +78,7 @@
* @param ObjectKey The new PrimaryKey for the object.
* @exception Exception, This method might throw an exceptions
*/
- public void setPrimaryKey(ObjectKey primaryKey) throws Exception;
+ void setPrimaryKey(ObjectKey primaryKey) throws Exception;
/**
* Sets the PrimaryKey for the object.
@@ -87,14 +87,15 @@
* ObjectKey.toString().
* @exception Exception, This method might throw an exceptions
*/
- public void setPrimaryKey(String primaryKey) throws Exception;
+ void setPrimaryKey(String primaryKey) throws Exception;
+
/**
* Returns whether the object has been modified, since it was
* last retrieved from storage.
*
* @return True if the object has been modified.
*/
- public boolean isModified();
+ boolean isModified();
/**
* Returns whether the object has ever been saved. This will
@@ -103,7 +104,7 @@
*
* @return true, if the object has never been persisted.
*/
- public boolean isNew();
+ boolean isNew();
/**
* Setter for the isNew attribute. This method will be called
@@ -111,12 +112,12 @@
*
* @param b, the state of the object.
*/
- public void setNew(boolean b);
+ void setNew(boolean b);
/**
* Sets the modified state for the object.
*
* @param m The new modified state for the object.
*/
- public void setModified(boolean m);
+ void setModified(boolean m);
}
1.5 +3 -3 jakarta-turbine-torque/src/java/org/apache/torque/om/Retrievable.java
Index: Retrievable.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/Retrievable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Retrievable.java 2001/09/20 00:06:27 1.4
+++ Retrievable.java 2001/10/15 16:53:10 1.5
@@ -58,7 +58,7 @@
* This interface specifies methods for uniquely identifying an object.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: Retrievable.java,v 1.4 2001/09/20 00:06:27 jon Exp $
+ * @version $Id: Retrievable.java,v 1.5 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface Retrievable
{
@@ -66,13 +66,13 @@
* get an id that differentiates this object from others
* of its class.
*/
- public String getQueryKey();
+ String getQueryKey();
/**
* set an id that differentiates this object from others
* of its class.
*/
- public void setQueryKey(String key) throws Exception;
+ void setQueryKey(String key) throws Exception;
}
1.5 +2 -2 jakarta-turbine-torque/src/java/org/apache/torque/om/Retriever.java
Index: Retriever.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/Retriever.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Retriever.java 2001/09/20 00:06:27 1.4
+++ Retriever.java 2001/10/15 16:53:10 1.5
@@ -58,7 +58,7 @@
* This interface marks a class that has a retrieve(String) method.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: Retriever.java,v 1.4 2001/09/20 00:06:27 jon Exp $
+ * @version $Id: Retriever.java,v 1.5 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface Retriever
{
@@ -68,7 +68,7 @@
*
* @return the object that matches the key
*/
- public Object retrieve(String key)
+ Object retrieve(String key)
throws Exception;
}
1.3 +2 -2 jakarta-turbine-torque/src/java/org/apache/torque/om/RetrieverFactory.java
Index: RetrieverFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/RetrieverFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RetrieverFactory.java 2001/08/10 12:23:03 1.2
+++ RetrieverFactory.java 2001/10/15 16:53:10 1.3
@@ -58,7 +58,7 @@
*
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: RetrieverFactory.java,v 1.2 2001/08/10 12:23:03 knielsen Exp $
+ * @version $Id: RetrieverFactory.java,v 1.3 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface RetrieverFactory
{
@@ -67,6 +67,6 @@
*
* @return the object that matches the key
*/
- public Retriever getInstance(String className)
+ Retriever getInstance(String className)
throws Exception;
}
1.2 +4 -4 jakarta-turbine-torque/src/java/org/apache/torque/om/SecurePersistent.java
Index: SecurePersistent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/SecurePersistent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurePersistent.java 2001/09/10 21:14:02 1.1
+++ SecurePersistent.java 2001/10/15 16:53:10 1.2
@@ -62,7 +62,7 @@
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:fedor@apache.org">Fedor K.</a>
- * @version $Id: SecurePersistent.java,v 1.1 2001/09/10 21:14:02 jmcnally Exp $
+ * @version $Id: SecurePersistent.java,v 1.2 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface SecurePersistent
extends Persistent
@@ -70,13 +70,13 @@
/**
* Saves the object.
*/
- public void save(SecurityInfo securityInfo) throws Exception;
+ void save(SecurityInfo securityInfo) throws Exception;
/**
* Stores the object in the database. If the object is new,
* it inserts it; otherwise an update is performed.
*/
- public void save(String dbName, SecurityInfo securityInfo)
+ void save(String dbName, SecurityInfo securityInfo)
throws Exception;
/**
@@ -86,6 +86,6 @@
* the save() method and the connection details will be handled
* internally
*/
- public void save(DBConnection dbCon, SecurityInfo securityInfo)
+ void save(DBConnection dbCon, SecurityInfo securityInfo)
throws Exception;
}
1.2 +4 -4 jakarta-turbine-torque/src/java/org/apache/torque/om/UnsecurePersistent.java
Index: UnsecurePersistent.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/om/UnsecurePersistent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UnsecurePersistent.java 2001/09/10 21:14:02 1.1
+++ UnsecurePersistent.java 2001/10/15 16:53:10 1.2
@@ -61,7 +61,7 @@
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:fedor@apache.org">Fedor K.</a>
- * @version $Id: UnsecurePersistent.java,v 1.1 2001/09/10 21:14:02 jmcnally Exp $
+ * @version $Id: UnsecurePersistent.java,v 1.2 2001/10/15 16:53:10 jmcnally Exp $
*/
public interface UnsecurePersistent
extends Persistent
@@ -69,13 +69,13 @@
/**
* Saves the object.
*/
- public void save() throws Exception;
+ void save() throws Exception;
/**
* Stores the object in the database. If the object is new,
* it inserts it; otherwise an update is performed.
*/
- public void save(String dbName) throws Exception;
+ void save(String dbName) throws Exception;
/**
* Stores the object in the database. If the object is new,
@@ -84,5 +84,5 @@
* the save() method and the connection details will be handled
* internally
*/
- public void save(DBConnection dbCon) throws Exception;
+ void save(DBConnection dbCon) throws Exception;
}
1.2 +2 -2 jakarta-turbine-torque/src/java/org/apache/torque/security/SecurityInfo.java
Index: SecurityInfo.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/security/SecurityInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityInfo.java 2001/09/10 21:14:02 1.1
+++ SecurityInfo.java 2001/10/15 16:53:11 1.2
@@ -59,12 +59,12 @@
* which need to pass authorization.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: SecurityInfo.java,v 1.1 2001/09/10 21:14:02 jmcnally Exp $
+ * @version $Id: SecurityInfo.java,v 1.2 2001/10/15 16:53:11 jmcnally Exp $
*/
public interface SecurityInfo
{
/**
* method called by an om prior to sensitive operation (such as save).
*/
- public boolean hasPermission();
+ boolean hasPermission();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org