You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/07/26 22:19:46 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/util/conf AbstractConfiguration.java
remm 00/07/26 13:19:45
Modified: src/share/org/apache/slide/store
AbstractDescriptorsStore.java
ContentStoreFilesystemImpl.java
DescriptorsStoreDatabaseImpl.java
DescriptorsStoreMemoryImpl.java
src/share/org/apache/slide/structure ObjectNode.java
src/share/org/apache/slide/util/conf
AbstractConfiguration.java
Log:
- Should fix most JDK 1.1 compliance issues
Revision Changes Path
1.2 +5 -5 jakarta-slide/src/share/org/apache/slide/store/AbstractDescriptorsStore.java
Index: AbstractDescriptorsStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractDescriptorsStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractDescriptorsStore.java 2000/05/16 01:00:38 1.1
+++ AbstractDescriptorsStore.java 2000/07/26 20:19:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractDescriptorsStore.java,v 1.1 2000/05/16 01:00:38 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/05/16 01:00:38 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractDescriptorsStore.java,v 1.2 2000/07/26 20:19:44 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/07/26 20:19:44 $
*
* ====================================================================
*
@@ -81,7 +81,7 @@
* operations.
*
* @author <a href="mailto:remm@exoffice.com">Remy Maucherat</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractDescriptorsStore extends ServiceImpl
implements DescriptorsStore {
@@ -341,7 +341,7 @@
Vector permissionsVector = null;
if (value != null) {
permissionsVector = (Vector) value;
- permissionsVector.clear();
+ permissionsVector.removeAllElements();
}
}
}
1.2 +6 -6 jakarta-slide/src/share/org/apache/slide/store/ContentStoreFilesystemImpl.java
Index: ContentStoreFilesystemImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/ContentStoreFilesystemImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentStoreFilesystemImpl.java 2000/05/09 02:47:27 1.1
+++ ContentStoreFilesystemImpl.java 2000/07/26 20:19:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/ContentStoreFilesystemImpl.java,v 1.1 2000/05/09 02:47:27 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/05/09 02:47:27 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/ContentStoreFilesystemImpl.java,v 1.2 2000/07/26 20:19:44 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/07/26 20:19:44 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* Filesystem implementation of ContentStore.
*
* @author <a href="mailto:remm@exoffice.com">Remy Maucherat</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ContentStoreFilesystemImpl extends ServiceImpl
implements ContentStore {
@@ -238,7 +238,7 @@
try {
File file = new File(rootpath + revisionUri);
- File parentFile = file.getParentFile();
+ File parentFile = new File(file.getParent());
if ((parentFile != null) && (!parentFile.exists())) {
parentFile.mkdirs();
}
@@ -345,7 +345,7 @@
try {
File file = new File(rootpath + revisionUri);
boolean deleted = file.delete();
- File parentFile = file.getParentFile();
+ File parentFile = new File(file.getParent());
if (parentFile != null) {
parentFile.delete();
}
1.3 +7 -6 jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreDatabaseImpl.java
Index: DescriptorsStoreDatabaseImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreDatabaseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DescriptorsStoreDatabaseImpl.java 2000/05/16 01:00:38 1.2
+++ DescriptorsStoreDatabaseImpl.java 2000/07/26 20:19:44 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreDatabaseImpl.java,v 1.2 2000/05/16 01:00:38 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/05/16 01:00:38 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreDatabaseImpl.java,v 1.3 2000/07/26 20:19:44 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/07/26 20:19:44 $
*
* ====================================================================
*
@@ -80,7 +80,7 @@
* JDBC 1.0 and 2.0 compliant DataSource implementation.
*
* @author <a href="mailto:remm@exoffice.com">Remy Maucherat</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class DescriptorsStoreDatabaseImpl
extends AbstractDescriptorsStore {
@@ -1323,8 +1323,9 @@
properties.put(propertyName, property);
}
- revisionDescriptor = new NodeRevisionDescriptor
- (revisionNumber, branchName, labels, properties);
+ revisionDescriptor =
+ new NodeRevisionDescriptor(revisionNumber, branchName,
+ labels, properties);
} catch (SQLException e) {
throw new ServiceAccessException(this, e);
1.2 +5 -5 jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreMemoryImpl.java
Index: DescriptorsStoreMemoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreMemoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DescriptorsStoreMemoryImpl.java 2000/05/09 02:47:28 1.1
+++ DescriptorsStoreMemoryImpl.java 2000/07/26 20:19:44 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreMemoryImpl.java,v 1.1 2000/05/09 02:47:28 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/05/09 02:47:28 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/DescriptorsStoreMemoryImpl.java,v 1.2 2000/07/26 20:19:44 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/07/26 20:19:44 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* Reference implementation.
*
* @author <a href="mailto:remm@exoffice.com">Remy Maucherat</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DescriptorsStoreMemoryImpl extends ServiceImpl
implements DescriptorsStore {
@@ -351,7 +351,7 @@
Vector permissionsVector = null;
if (value != null) {
permissionsVector = (Vector) value;
- permissionsVector.clear();
+ permissionsVector.removeAllElements();
}
}
1.2 +5 -5 jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java
Index: ObjectNode.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectNode.java 2000/05/09 02:47:29 1.1
+++ ObjectNode.java 2000/07/26 20:19:45 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v 1.1 2000/05/09 02:47:29 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/05/09 02:47:29 $
+ * $Header: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/ObjectNode.java,v 1.2 2000/07/26 20:19:45 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/07/26 20:19:45 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
* This includes actors, activities and collections.
*
* @author <a href="mailto:remm@exoffice.com">Remy Maucherat</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class ObjectNode implements Serializable, Cloneable {
@@ -202,7 +202,7 @@
* Remove all children.
*/
void removeChildren() {
- children.clear();
+ children.removeAllElements();
}
1.2 +3 -3 jakarta-slide/src/share/org/apache/slide/util/conf/AbstractConfiguration.java
Index: AbstractConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/conf/AbstractConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractConfiguration.java 2000/07/14 16:44:52 1.1
+++ AbstractConfiguration.java 2000/07/26 20:19:45 1.2
@@ -20,7 +20,7 @@
* (Apache Software Foundation)
* @author <a href="mailto:fumagalli@exoffice.com">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
- * @version CVS $Revision: 1.1 $ $Date: 2000/07/14 16:44:52 $
+ * @version CVS $Revision: 1.2 $ $Date: 2000/07/26 20:19:45 $
*/
public abstract class AbstractConfiguration implements Configuration {
/**
@@ -97,7 +97,7 @@
throws ConfigurationException {
String value=this.getValue();
try {
- return(Float.parseFloat(value));
+ return(Float.valueOf(value).floatValue());
} catch (NumberFormatException e) {
throw new ConfigurationException("Cannot parse the value of the "+
"configuration element \""+this.getName()+"\" as a float",
@@ -225,7 +225,7 @@
throws ConfigurationException {
String value=this.getAttribute(name);
try {
- return(Float.parseFloat(value));
+ return(Float.valueOf(value).floatValue());
} catch (NumberFormatException e) {
throw new ConfigurationException("Cannot parse the value of the "+
"attribute \""+name+"\" of the configuration element \""+