Menu
▾
▴
[Hibernate-commits] Hibernate2/src/net/sf/hibernate/eg Edge.java,1.1.1.1,1.2 NetworkDemo.java,1.1.1.1,1.2 Source.java,1.1.1.1,1.2 Vertex.java,1.1.1.1,1.2
|
From: <one...@us...> - 2003-01-04 11:16:01
|
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg
In directory sc8-pr-cvs1:/tmp/cvs-serv14211/src/net/sf/hibernate/eg
Modified Files:
Edge.java NetworkDemo.java Source.java Vertex.java
Log Message:
reformatted code with beautiful, shiny, happy TABS!
improved an exception
Index: Edge.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Edge.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Edge.java 1 Jan 2003 13:54:17 -0000 1.1.1.1
--- Edge.java 4 Jan 2003 11:15:28 -0000 1.2
***************
*** 12,72 ****
private long key;
private Date creationDate = new Date();
!
public float getCapacity() {
return capacity;
}
!
public void setCapacity(float capacity) {
this.capacity = capacity;
}
!
public float getLength() {
return length;
}
!
public void setLength(float length) {
this.length = length;
}
!
public String getName() {
return name;
}
!
public void setName(String name) {
this.name = name;
}
!
public Vertex getSource() {
return source;
}
!
void setSource(Vertex source) {
this.source = source;
}
!
public Vertex getSink() {
return sink;
}
!
void setSink(Vertex sink) {
this.sink = sink;
}
!
public long getKey() {
return key;
}
!
private void setKey(long key) {
this.key = key;
}
!
public Date getCreationDate() {
return creationDate;
}
!
private void setCreationDate(Date creationDate) {
this.creationDate = creationDate;
}
!
}
--- 12,75 ----
private long key;
private Date creationDate = new Date();
!
public float getCapacity() {
return capacity;
}
!
public void setCapacity(float capacity) {
this.capacity = capacity;
}
!
public float getLength() {
return length;
}
!
public void setLength(float length) {
this.length = length;
}
!
public String getName() {
return name;
}
!
public void setName(String name) {
this.name = name;
}
!
public Vertex getSource() {
return source;
}
!
void setSource(Vertex source) {
this.source = source;
}
!
public Vertex getSink() {
return sink;
}
!
void setSink(Vertex sink) {
this.sink = sink;
}
!
public long getKey() {
return key;
}
!
private void setKey(long key) {
this.key = key;
}
!
public Date getCreationDate() {
return creationDate;
}
!
private void setCreationDate(Date creationDate) {
this.creationDate = creationDate;
}
!
}
+
+
+
Index: NetworkDemo.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/NetworkDemo.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NetworkDemo.java 1 Jan 2003 13:54:18 -0000 1.1.1.1
--- NetworkDemo.java 4 Jan 2003 11:15:28 -0000 1.2
***************
*** 23,28 ****
ds = Hibernate.createDatastore()
! .storeClass(Vertex.class)
! .storeClass(Edge.class);
// build a SessionFactory
--- 23,28 ----
ds = Hibernate.createDatastore()
! .storeClass(Vertex.class)
! .storeClass(Edge.class);
// build a SessionFactory
***************
*** 31,35 ****
// process a stream of commands
!
BufferedReader reader = new BufferedReader( new InputStreamReader(System.in) );
boolean quit=false;
--- 31,35 ----
// process a stream of commands
!
BufferedReader reader = new BufferedReader( new InputStreamReader(System.in) );
boolean quit=false;
***************
*** 70,76 ****
return false;
}
!
private static void processCommand(String[] args) throws Exception {
!
try {
--- 70,76 ----
return false;
}
!
private static void processCommand(String[] args) throws Exception {
!
try {
***************
*** 80,84 ****
try {
!
if ( args[1].equals("vertex") ) {
Vertex v = new Vertex();
--- 80,84 ----
try {
!
if ( args[1].equals("vertex") ) {
Vertex v = new Vertex();
***************
*** 135,139 ****
sess.close();
}
!
}
--- 135,139 ----
sess.close();
}
!
}
***************
*** 143,147 ****
try {
!
if ( args[1].equals("edge") ) {
for ( int i=2; i<args.length; i++) {
--- 143,147 ----
try {
!
if ( args[1].equals("edge") ) {
for ( int i=2; i<args.length; i++) {
***************
*** 158,164 ****
}
else if ( args[1].equals("vertex") ) {
! for ( int i=2; i<args.length; i++) {
! Vertex v = (Vertex) sess.find(
! "from v in class net.sf.hibernate.eg.Vertex where v.name = ?",
args[i],
Hibernate.STRING
--- 158,164 ----
}
else if ( args[1].equals("vertex") ) {
! for ( int i=2; i<args.length; i++) {
! Vertex v = (Vertex) sess.find(
! "from v in class net.sf.hibernate.eg.Vertex where v.name = ?",
args[i],
Hibernate.STRING
***************
*** 171,175 ****
System.out.println("usage: delete ( vertex | edge ) <name> [ <name> ] ... ");
}
!
sess.flush();
sess.connection().commit();
--- 171,175 ----
System.out.println("usage: delete ( vertex | edge ) <name> [ <name> ] ... ");
}
!
sess.flush();
sess.connection().commit();
***************
*** 191,196 ****
try {
!
! if ( args[1].equals("edge") ) {
Edge e = (Edge) sess.find(
"from e in class net.sf.hibernate.eg.Edge where e.name = ?",
--- 191,196 ----
try {
!
! if ( args[1].equals("edge") ) {
Edge e = (Edge) sess.find(
"from e in class net.sf.hibernate.eg.Edge where e.name = ?",
***************
*** 201,207 ****
System.out.println("renamed");
}
! else if ( args[1].equals("vertex") ) {
! Vertex v = (Vertex) sess.find(
! "from v in class net.sf.hibernate.eg.Vertex where v.name = ?",
args[2],
Hibernate.STRING
--- 201,207 ----
System.out.println("renamed");
}
! else if ( args[1].equals("vertex") ) {
! Vertex v = (Vertex) sess.find(
! "from v in class net.sf.hibernate.eg.Vertex where v.name = ?",
args[2],
Hibernate.STRING
***************
*** 226,230 ****
}
}
!
else if ( args[0].equals("show") ) {
--- 226,230 ----
}
}
!
else if ( args[0].equals("show") ) {
***************
*** 232,248 ****
try {
!
Iterator iter = sess.find( "from v in class net.sf.hibernate.eg.Vertex" ).iterator();
while ( iter.hasNext() ) {
Vertex v = (Vertex) iter.next();
! System.out.println(
! ( (v instanceof Source) ? "source ":"vertex " ) +
! v.getName() +
! ": " +
! v.getExcessCapacity() +
! " " +
! v.getIncoming().size() +
! "," +
! v.getOutgoing().size()
);
}
--- 232,248 ----
try {
!
Iterator iter = sess.find( "from v in class net.sf.hibernate.eg.Vertex" ).iterator();
while ( iter.hasNext() ) {
Vertex v = (Vertex) iter.next();
! System.out.println(
! ( (v instanceof Source) ? "source ":"vertex " ) +
! v.getName() +
! ": " +
! v.getExcessCapacity() +
! " " +
! v.getIncoming().size() +
! "," +
! v.getOutgoing().size()
);
}
***************
*** 250,264 ****
while ( iter.hasNext() ) {
Edge e = (Edge) iter.next();
! System.out.println(
"edge " +
! e.getName() +
! ": " +
e.getSource().getName() +
! "->" +
! e.getSink().getName() +
! " " +
e.getCapacity() +
! " " +
! e.getLength()
);
}
--- 250,264 ----
while ( iter.hasNext() ) {
Edge e = (Edge) iter.next();
! System.out.println(
"edge " +
! e.getName() +
! ": " +
e.getSource().getName() +
! "->" +
! e.getSink().getName() +
! " " +
e.getCapacity() +
! " " +
! e.getLength()
);
}
***************
*** 280,284 ****
String query="";
for ( int i=1; i<args.length; i++ ) {
! query=query+args[i]+" ";
}
--- 280,284 ----
String query="";
for ( int i=1; i<args.length; i++ ) {
! query=query+args[i]+" ";
}
***************
*** 287,291 ****
db.setInitializeLazy(true);
try {
!
Iterator iter = sess.find(query).iterator();
while ( iter.hasNext() ) {
--- 287,291 ----
db.setInitializeLazy(true);
try {
!
Iterator iter = sess.find(query).iterator();
while ( iter.hasNext() ) {
***************
*** 293,299 ****
}
System.out.println( db.toXML() );
!
sess.connection().commit();
!
}
catch (Exception e) {
--- 293,299 ----
}
System.out.println( db.toXML() );
!
sess.connection().commit();
!
}
catch (Exception e) {
***************
*** 310,314 ****
System.out.println("type \"command help\" for usage description");
}
!
}
catch (ArrayIndexOutOfBoundsException abe) {
--- 310,314 ----
System.out.println("type \"command help\" for usage description");
}
!
}
catch (ArrayIndexOutOfBoundsException abe) {
***************
*** 322,324 ****
--- 322,327 ----
}
}
+
+
+
Index: Source.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Source.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Source.java 1 Jan 2003 13:54:18 -0000 1.1.1.1
--- Source.java 4 Jan 2003 11:15:28 -0000 1.2
***************
*** 4,12 ****
public class Source extends Vertex {
private float strength;
!
public float getSourceStrength() {
return strength;
}
!
public void setSourceStrength(float strength) {
this.strength = strength;
--- 4,12 ----
public class Source extends Vertex {
private float strength;
!
public float getSourceStrength() {
return strength;
}
!
public void setSourceStrength(float strength) {
this.strength = strength;
***************
*** 17,19 ****
--- 17,22 ----
}
}
+
+
+
Index: Vertex.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Vertex.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Vertex.java 1 Jan 2003 13:54:20 -0000 1.1.1.1
--- Vertex.java 4 Jan 2003 11:15:28 -0000 1.2
***************
*** 10,26 ****
private int version;
private Date creationDate = new Date();
!
protected Set getIncoming() {
return incoming;
}
!
protected void setIncoming(Set incoming) {
this.incoming = incoming;
}
!
protected Set getOutgoing() {
return outgoing;
}
!
protected void setOutgoing(Set outgoing) {
this.outgoing = outgoing;
--- 10,26 ----
private int version;
private Date creationDate = new Date();
!
protected Set getIncoming() {
return incoming;
}
!
protected void setIncoming(Set incoming) {
this.incoming = incoming;
}
!
protected Set getOutgoing() {
return outgoing;
}
!
protected void setOutgoing(Set outgoing) {
this.outgoing = outgoing;
***************
*** 50,54 ****
return name;
}
!
public void setName(String name) {
this.name = name;
--- 50,54 ----
return name;
}
!
public void setName(String name) {
this.name = name;
***************
*** 65,94 ****
return excess;
}
!
!
public long getKey() {
return key;
}
!
private void setKey(long key) {
this.key = key;
}
!
public int getVersion() {
return version;
}
!
private void setVersion(int version) {
this.version = version;
}
!
public Date getCreationDate() {
return creationDate;
}
!
private void setCreationDate(Date creationDate) {
this.creationDate = creationDate;
}
!
}
--- 65,97 ----
return excess;
}
!
!
public long getKey() {
return key;
}
!
private void setKey(long key) {
this.key = key;
}
!
public int getVersion() {
return version;
}
!
private void setVersion(int version) {
this.version = version;
}
!
public Date getCreationDate() {
return creationDate;
}
!
private void setCreationDate(Date creationDate) {
this.creationDate = creationDate;
}
!
}
+
+
+
|
