cziegeler 2004/04/01 04:29:47
Modified: src/java/org/apache/cocoon/components/xpointer/parser
SimpleCharStream.java
src/java/org/apache/cocoon/acting
AbstractComplementaryConfigurableAction.java
src/java/org/apache/cocoon/xml/dom DOMBuilder.java
src/java/org/apache/cocoon/components/notification
Notifier.java
Removed: src/java/org/apache/cocoon/components/modules/input
DefaultsMetaModule.java
Log:
Remove deprecated code
Revision Changes Path
1.4 +0 -18
cocoon-2.2/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
Index: SimpleCharStream.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleCharStream.java 8 Mar 2004 14:01:55 -0000 1.3
+++ SimpleCharStream.java 1 Apr 2004 12:29:47 -0000 1.4
@@ -227,24 +227,6 @@
return (c);
}
- /**
- * @deprecated
- * @see #getEndColumn
- */
-
- public int getColumn() {
- return bufcolumn[bufpos];
- }
-
- /**
- * @deprecated
- * @see #getEndLine
- */
-
- public int getLine() {
- return bufline[bufpos];
- }
-
public int getEndColumn() {
return bufcolumn[bufpos];
}
1.6 +1 -9
cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java
Index: AbstractComplementaryConfigurableAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractComplementaryConfigurableAction.java 8 Mar 2004 13:57:35
-0000 1.5
+++ AbstractComplementaryConfigurableAction.java 1 Apr 2004 12:29:47
-0000 1.6
@@ -55,14 +55,6 @@
}
/**
- * @deprecated please use the getConfiguration(String, SourceResolver,
boolean)
- * version of this method instead.
- */
- protected Configuration getConfiguration(String descriptor, boolean
reloadable) throws ConfigurationException {
- return this.getConfiguration( descriptor, null, reloadable );
- }
-
- /**
* Set up the complementary configuration file. Please note that
* multiple Actions can share the same configurations. By using
* this approach, we can limit the number of config files.
1.5 +2 -26
cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/xml/dom/DOMBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMBuilder.java 8 Mar 2004 14:04:01 -0000 1.4
+++ DOMBuilder.java 1 Apr 2004 12:29:47 -0000 1.5
@@ -55,14 +55,6 @@
/**
* Construct a new instance of this DOMBuilder.
- * @deprecated Use DOMBuilder() instead.
- */
- public DOMBuilder(DOMFactory factory) {
- this( (Listener)null, (Node)null );
- }
-
- /**
- * Construct a new instance of this DOMBuilder.
*/
public DOMBuilder( Listener listener ) {
this(listener, null);
@@ -70,22 +62,6 @@
/**
* Construct a new instance of this DOMBuilder.
- * @deprecated Use DOMBuilder(listener) instead.
- */
- public DOMBuilder( DOMFactory factory, Listener listener ) {
- this(listener, null);
- }
-
- /**
- * Construct a new instance of this DOMBuilder.
- * @deprecated Use DOMBuilder(listener, parentNode) instead.
- */
- public DOMBuilder( DOMFactory domFactory, Listener listener, Node
parentNode ) {
- this(listener, parentNode);
- }
-
- /**
- * Construct a new instance of this DOMBuilder.
*/
public DOMBuilder( Listener listener, Node parentNode ) {
super();
@@ -113,7 +89,7 @@
* which does not happen here.
*/
public DOMBuilder( Node parentNode ) {
- this(null, null, parentNode);
+ this(null, parentNode);
}
/**
1.5 +1 -26
cocoon-2.2/src/java/org/apache/cocoon/components/notification/Notifier.java
Index: Notifier.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/notification/Notifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Notifier.java 8 Mar 2004 13:58:31 -0000 1.4
+++ Notifier.java 1 Apr 2004 12:29:47 -0000 1.5
@@ -35,21 +35,6 @@
*/
public class Notifier {
- /*
- * Generate notification information as a response.
- * The notification is directly written to the OutputStream.
- * @param n The <code>Notifying</code> object
- * @param outputStream The output stream the notification is written to
- * This could be <code>null</code>.
- * @deprecated There is no way in which this method could understand
what mime/type to use. Instead use void notify(Notifying n, OutputStream
outputStream, String mimetype), where the mime/type is requested.
- * @see #notify(Notifying n, OutputStream, String)
-
- public static String notify(Notifying n, OutputStream outputStream)
throws IOException {
- notify(n, outputStream, "text/html") ;
- return "text/html";
- }
- */
-
/**
* Generate notification information as a response.
* The notification is directly written to the OutputStream.
@@ -108,16 +93,6 @@
if (outputStream != null)
outputStream.write(sb.toString().getBytes());
}
-
- /*
- * Generate notification information in XML format.
- * @deprecated Using a ContentHandler doesn't mean that a mimetype
cannot be specified; it could be svg or
- * @see #notify(Notifying, ContentHandler, String)
-
- public static void notify(Notifying n, ContentHandler ch) throws
SAXException {
- notify(n, ch, "text/xml");
- }
- */
/**
* Generate notification information in XML format.
