bloritsch 01/05/31 09:12:49 Modified: src/org/apache/cocoon Cocoon.java src/org/apache/cocoon/components/browser Browser.java src/org/apache/cocoon/components/pipeline EventPipeline.java StreamPipeline.java src/org/apache/cocoon/components/sax XMLDeserializer.java XMLSerializer.java src/org/apache/cocoon/xml XMLFragment.java Log: Removed unnecessary modifiers on interfaces--as per Sun's recommended practice Revision Changes Path 1.7 +2 -2 xml-cocoon2/src/org/apache/cocoon/Cocoon.java Index: Cocoon.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/Cocoon.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Cocoon.java 2001/05/31 13:18:35 1.6 +++ Cocoon.java 2001/05/31 16:12:33 1.7 @@ -53,7 +53,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a> (Apache Software Foundation, Exoffice Technologies) * @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a> - * @version CVS $Revision: 1.6 $ $Date: 2001/05/31 13:18:35 $ + * @version CVS $Revision: 1.7 $ $Date: 2001/05/31 16:12:33 $ */ public class Cocoon extends AbstractLoggable implements ThreadSafe, Component, Initializable, Disposable, Modifiable, Processor, Contextualizable { /** The application context */ @@ -279,7 +279,7 @@ System.setProperties(systemProps); } - public synchronized void dispose() { + public void dispose() { this.disposed = true; this.componentManager.dispose(); 1.2 +4 -4 xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java Index: Browser.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/browser/Browser.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Browser.java 2001/05/09 20:49:48 1.1 +++ Browser.java 2001/05/31 16:12:35 1.2 @@ -14,7 +14,7 @@ /** * * @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a> - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:48 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:35 $ */ public interface Browser extends Component { @@ -26,9 +26,9 @@ * @param userAgent a <code>String</code> value * @param acceptHeader a <code>String</code> value * @return a <code>String</code> value */ - public HashMap getBrowser(String userAgent, String acceptHeader); + HashMap getBrowser(String userAgent, String acceptHeader); - public String getMedia(HashMap browserInfo); + String getMedia(HashMap browserInfo); - public Document getUACapabilities(HashMap browserInfo); + Document getUACapabilities(HashMap browserInfo); } 1.2 +7 -7 xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java Index: EventPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/EventPipeline.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- EventPipeline.java 2001/05/09 20:49:48 1.1 +++ EventPipeline.java 2001/05/31 16:12:38 1.2 @@ -18,13 +18,13 @@ /** * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:48 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:38 $ */ public interface EventPipeline extends Component, Composable, Recyclable, Processor { - public void setGenerator (String role, String source, Parameters param, Exception e) throws Exception; - public void setGenerator (String role, String source, Parameters param) throws Exception; - public Generator getGenerator (); - public void addTransformer (String role, String source, Parameters param) throws Exception; - public void setSitemap(Sitemap sitemap); - public boolean process(Environment environment) throws Exception; + void setGenerator (String role, String source, Parameters param, Exception e) throws Exception; + void setGenerator (String role, String source, Parameters param) throws Exception; + Generator getGenerator (); + void addTransformer (String role, String source, Parameters param) throws Exception; + void setSitemap(Sitemap sitemap); + boolean process(Environment environment) throws Exception; } 1.2 +7 -7 xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java Index: StreamPipeline.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/pipeline/StreamPipeline.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StreamPipeline.java 2001/05/09 20:49:48 1.1 +++ StreamPipeline.java 2001/05/31 16:12:39 1.2 @@ -20,14 +20,14 @@ * <CODE>Serializer</CODE> and let them produce the character stream * </UL> * @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a> - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:48 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:39 $ */ public interface StreamPipeline extends Component, Composable, Recyclable, Processor { - public void setEventPipeline (EventPipeline eventPipeline) throws Exception; - public EventPipeline getEventPipeline (); - public void setReader (String role, String source, Parameters param) throws Exception; - public void setReader (String role, String source, Parameters param, String mimeType) throws Exception; - public void setSerializer (String role, String source, Parameters param) throws Exception; - public void setSerializer (String role, String source, Parameters param, String mimeType) throws Exception; + void setEventPipeline (EventPipeline eventPipeline) throws Exception; + EventPipeline getEventPipeline (); + void setReader (String role, String source, Parameters param) throws Exception; + void setReader (String role, String source, Parameters param, String mimeType) throws Exception; + void setSerializer (String role, String source, Parameters param) throws Exception; + void setSerializer (String role, String source, Parameters param, String mimeType) throws Exception; } 1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java Index: XMLDeserializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLDeserializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLDeserializer.java 2001/05/09 20:49:59 1.1 +++ XMLDeserializer.java 2001/05/31 16:12:43 1.2 @@ -22,7 +22,7 @@ * the serialized data. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:59 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:43 $ */ public interface XMLDeserializer extends XMLProducer { @@ -32,6 +32,6 @@ * * @param saxFragment The xml data. */ - public void deserialize(Object saxFragment) + void deserialize(Object saxFragment) throws SAXException; } 1.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/components/sax/XMLSerializer.java Index: XMLSerializer.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/sax/XMLSerializer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLSerializer.java 2001/05/09 20:50:00 1.1 +++ XMLSerializer.java 2001/05/31 16:12:44 1.2 @@ -17,7 +17,7 @@ * the serialized data. * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:50:00 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:44 $ */ public interface XMLSerializer extends XMLConsumer { @@ -26,5 +26,5 @@ * * @return The serialized xml data. */ - public Object getSAXFragment(); + Object getSAXFragment(); } 1.2 +3 -3 xml-cocoon2/src/org/apache/cocoon/xml/XMLFragment.java Index: XMLFragment.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/XMLFragment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLFragment.java 2001/05/09 20:49:31 1.1 +++ XMLFragment.java 2001/05/31 16:12:47 1.2 @@ -21,7 +21,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Sylvain Wallez</a> * @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a> for the original XObject class - * @version CVS $Revision: 1.1 $ $Date: 2001/05/09 20:49:31 $ + * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 16:12:47 $ */ public interface XMLFragment { @@ -29,10 +29,10 @@ * Generates SAX events representing the object's state * for the given content handler. */ - public void toSAX(ContentHandler handler) throws SAXException; + void toSAX(ContentHandler handler) throws SAXException; /** * Appends children representing the object's state to the given node. */ - public void toDOM(Node node) throws Exception; + void toDOM(Node node) throws Exception; } ---------------------------------------------------------------------- In case of troubles, e-mail: [EMAIL PROTECTED] To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]