Fix import statements and javadoc comments
This commit is contained in:
parent
dac8f7d54c
commit
2efb42922d
11 changed files with 47 additions and 31 deletions
|
@ -16,10 +16,10 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.IOException;
|
||||||
import java.io.ObjectInputStream;
|
import java.io.ObjectInputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.Serializable;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -17,8 +17,10 @@
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.util.SystemProperties;
|
import helma.util.SystemProperties;
|
||||||
import java.sql.*;
|
|
||||||
import java.util.Hashtable;
|
import java.sql.Connection;
|
||||||
|
import java.sql.DriverManager;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class describes a releational data source (URL, driver, user and password).
|
* This class describes a releational data source (URL, driver, user and password).
|
||||||
|
|
|
@ -16,7 +16,10 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.Externalizable;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.ObjectInput;
|
||||||
|
import java.io.ObjectOutput;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import java.rmi.*;
|
import java.rmi.Remote;
|
||||||
|
import java.rmi.RemoteException;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.IOException;
|
||||||
import java.io.ObjectInputStream;
|
import java.io.ObjectInputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.Serializable;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.objectmodel.*;
|
import helma.objectmodel.INodeState;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -16,12 +16,16 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.objectmodel.*;
|
import helma.objectmodel.INode;
|
||||||
import helma.util.*;
|
import helma.objectmodel.IProperty;
|
||||||
import java.io.*;
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.ObjectInputStream;
|
||||||
|
import java.io.ObjectOutputStream;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.text.*;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.*;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A property implementation for Nodes stored inside a database. Basically
|
* A property implementation for Nodes stored inside a database. Basically
|
||||||
|
@ -104,7 +108,7 @@ public final class Property implements IProperty, Serializable, Cloneable {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NODE:
|
case NODE:
|
||||||
value = (NodeHandle) in.readObject();
|
value = in.readObject();
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -381,8 +385,8 @@ public final class Property implements IProperty, Serializable, Cloneable {
|
||||||
nvalue.checkWriteLock();
|
nvalue.checkWriteLock();
|
||||||
|
|
||||||
// check if the property node is also a subnode
|
// check if the property node is also a subnode
|
||||||
// BUG: this doesn't work because properties for subnode/properties are never stored and therefore
|
// BUG: this doesn't work because properties for subnode/properties are never stored
|
||||||
// never reused.
|
// and therefore never reused.
|
||||||
if ((nvrel != null) && nvrel.hasAccessName()) {
|
if ((nvrel != null) && nvrel.hasAccessName()) {
|
||||||
node.removeNode(nvalue);
|
node.removeNode(nvalue);
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import java.rmi.*;
|
import java.rmi.Naming;
|
||||||
import java.util.*;
|
import java.util.Vector;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class replicates the updates of transactions to other applications via RMI
|
* This class replicates the updates of transactions to other applications via RMI
|
||||||
|
|
|
@ -16,11 +16,13 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.framework.TimeoutException;
|
import helma.objectmodel.DatabaseException;
|
||||||
import helma.objectmodel.*;
|
import helma.objectmodel.ITransaction;
|
||||||
import java.io.*;
|
|
||||||
import java.sql.*;
|
import java.sql.Connection;
|
||||||
import java.util.*;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Iterator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A subclass of thread that keeps track of changed nodes and triggers
|
* A subclass of thread that keeps track of changed nodes and triggers
|
||||||
|
@ -147,7 +149,6 @@ public class Transactor extends Thread {
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @param key ...
|
|
||||||
* @param node ...
|
* @param node ...
|
||||||
*/
|
*/
|
||||||
public void visitParentNode(Node node) {
|
public void visitParentNode(Node node) {
|
||||||
|
@ -188,10 +189,9 @@ public class Transactor extends Thread {
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* @param tnm ...
|
* @param name ...
|
||||||
*
|
*
|
||||||
* @throws Exception ...
|
* @throws Exception ...
|
||||||
* @throws DatabaseException ...
|
|
||||||
*/
|
*/
|
||||||
public synchronized void begin(String name) throws Exception {
|
public synchronized void begin(String name) throws Exception {
|
||||||
if (killed) {
|
if (killed) {
|
||||||
|
|
|
@ -16,7 +16,8 @@
|
||||||
|
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.objectmodel.*;
|
import helma.objectmodel.ObjectNotFoundException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
|
|
|
@ -17,11 +17,15 @@
|
||||||
package helma.objectmodel.db;
|
package helma.objectmodel.db;
|
||||||
|
|
||||||
import helma.objectmodel.*;
|
import helma.objectmodel.*;
|
||||||
import helma.objectmodel.dom.*;
|
import helma.objectmodel.dom.IDGenParser;
|
||||||
import java.io.*;
|
import helma.objectmodel.dom.XmlDatabaseReader;
|
||||||
import javax.xml.parsers.ParserConfigurationException;
|
import helma.objectmodel.dom.XmlWriter;
|
||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
|
import javax.xml.parsers.ParserConfigurationException;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A simple XML-database
|
* A simple XML-database
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Add table
Reference in a new issue