cziegeler 2004/03/19 06:21:06
Modified: src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common
ObjectIDImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/reading
ProxyReader.java
src/blocks/portal/java/org/apache/cocoon/portal/transformation
ProxyTransformer.java
src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket
BasketGenerator.java
src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
AuthenticationProfileManager.java
Log:
Remove unused parameters etc.
Revision Changes Path
1.5 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java
Index: ObjectIDImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ObjectIDImpl.java 5 Mar 2004 13:02:15 -0000 1.4
+++ ObjectIDImpl.java 19 Mar 2004 14:21:06 -0000 1.5
@@ -42,7 +42,7 @@
// internal methods.
- private void readObject (ObjectInputStream stream) throws IOException,
ClassNotFoundException
+ private void readObject (ObjectInputStream stream) throws IOException
{
intOID = stream.readInt ();
1.6 +1 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
Index: ProxyReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProxyReader.java 5 Mar 2004 13:02:16 -0000 1.5
+++ ProxyReader.java 19 Mar 2004 14:21:06 -0000 1.6
@@ -84,7 +84,6 @@
copletInstanceData =
ProxyTransformer.getInstanceData(
this.manager,
- objectModel,
copletID,
portalName);
1.8 +5 -7
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Index: ProxyTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProxyTransformer.java 5 Mar 2004 13:02:16 -0000 1.7
+++ ProxyTransformer.java 19 Mar 2004 14:21:06 -0000 1.8
@@ -231,7 +231,7 @@
* Processes the request to the external application
* @throws SAXException on any exceptions while sending the request.
*/
- protected void processRequest() throws SAXException {
+ protected void processRequest() {
try {
String remoteURI = null;
try {
@@ -422,8 +422,7 @@
* @return the result as valid W3C DOM XHTML document
* @throws IOException if any exceptions occure while reading from the
url connection.
*/
- protected Document readXML(HttpURLConnection connection)
- throws IOException {
+ protected Document readXML(HttpURLConnection connection) {
try {
int charEncoding = configuredEncoding;
@@ -598,10 +597,9 @@
}
public static CopletInstanceData getInstanceData(ServiceManager manager,
- Map objectModel,
String copletID,
String portalName)
- throws ProcessingException, IOException, SAXException {
+ throws ProcessingException {
// set portal name
PortalService portalService = null;
try {
@@ -631,7 +629,7 @@
public static CopletInstanceData getInstanceData(ServiceManager manager,
Map objectModel,
Parameters parameters)
- throws ProcessingException, IOException, SAXException {
+ throws ProcessingException {
PortalService portalService = null;
try {
1.4 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java
Index: BasketGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BasketGenerator.java 5 Mar 2004 13:02:11 -0000 1.3
+++ BasketGenerator.java 19 Mar 2004 14:21:06 -0000 1.4
@@ -158,7 +158,7 @@
* Render admin mode
*/
protected void generateAdminMode()
- throws IOException, SAXException, ProcessingException {
+ throws SAXException {
List baskets = this.basketManager.getBaskets();
PortalService service = null;
1.19 +4 -5
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
Index: AuthenticationProfileManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AuthenticationProfileManager.java 5 Mar 2004 13:02:16 -0000 1.18
+++ AuthenticationProfileManager.java 19 Mar 2004 14:21:06 -0000 1.19
@@ -304,7 +304,7 @@
try {
adapter =
(ProfileLS)this.manager.lookup(ProfileLS.ROLE);
- Object result = this.checkValidity(key, parameters,
forcedLoad, adapter, service);
+ Object result = this.checkValidity(key, parameters,
forcedLoad, adapter);
if (!(result instanceof SourceValidity))
return new Object[]{result, Boolean.FALSE};
@@ -314,7 +314,7 @@
this.lock.writeLock();
// check validity again in case of another thread has
already loaded
- result = this.checkValidity(key, parameters,
forcedLoad, adapter, service);
+ result = this.checkValidity(key, parameters,
forcedLoad, adapter);
if (!(result instanceof SourceValidity))
return new Object[]{result, Boolean.FALSE};
@@ -344,8 +344,7 @@
protected Object checkValidity(Object key,
Map parameters,
boolean forcedLoad,
- ProfileLS adapter,
- PortalService service) {
+ ProfileLS adapter) {
Object[] objects = (Object[])this.attributes.get(key);
SourceValidity sourceValidity = null;
