You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/02/04 19:07:51 UTC
cvs commit: cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/components/url StreamJDKRegistryEntry.java
joerg 2004/02/04 10:07:51
Modified: src/blocks/woody/java/org/apache/cocoon/woody/formmodel
AbstractWidgetDefinitionBuilder.java
AbstractWidgetDefinition.java
src/blocks/batik/java/org/apache/cocoon/components/url
StreamJDKRegistryEntry.java
Log:
clean up
Revision Changes Path
1.10 +0 -1 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java
Index: AbstractWidgetDefinitionBuilder.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinitionBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractWidgetDefinitionBuilder.java 4 Feb 2004 17:25:57 -0000 1.9
+++ AbstractWidgetDefinitionBuilder.java 4 Feb 2004 18:07:51 -0000 1.10
@@ -152,7 +152,6 @@
}
protected void setValidators(Element widgetElement, AbstractWidgetDefinition widgetDefinition) throws Exception {
- List result = null;
Element validatorElement = DomHelper.getChildElement(widgetElement, Constants.WD_NS, "validation");
if (validatorElement != null) {
NodeList list = validatorElement.getChildNodes();
1.7 +2 -3 cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinition.java
Index: AbstractWidgetDefinition.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AbstractWidgetDefinition.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractWidgetDefinition.java 4 Feb 2004 17:25:57 -0000 1.6
+++ AbstractWidgetDefinition.java 4 Feb 2004 18:07:51 -0000 1.7
@@ -55,13 +55,12 @@
import java.util.List;
import java.util.Map;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
import org.apache.cocoon.woody.Constants;
import org.apache.cocoon.woody.FormContext;
-import org.apache.cocoon.woody.validation.ValidationError;
import org.apache.cocoon.woody.validation.WidgetValidator;
import org.apache.excalibur.xml.sax.XMLizable;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
/**
* Provides functionality that is common across many WidgetDefinition implementations.
1.2 +5 -7 cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/components/url/StreamJDKRegistryEntry.java
Index: StreamJDKRegistryEntry.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/batik/java/org/apache/cocoon/components/url/StreamJDKRegistryEntry.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamJDKRegistryEntry.java 4 Feb 2004 14:39:28 -0000 1.1
+++ StreamJDKRegistryEntry.java 4 Feb 2004 18:07:51 -0000 1.2
@@ -183,13 +183,11 @@
while (true) {
try {
mediaTracker.waitForID(myID);
- }
- catch(InterruptedException ie) {
- // Something woke us up but the image
- // isn't done yet, so try again.
+ } catch(InterruptedException ie) {
+ // Something woke us up but the image
+ // isn't done yet, so try again.
continue;
- };
-
+ }
// All done!
break;
}