pgjindent jdbc files. First time jdbc files were formatted.

src/interfaces/jdbc/example/corba/StockDB.java

@@ -13,105 +13,122 @@ import java.sql.*;
  * that an object could be changed by another client, and we need to ensure that
  * the returned data is live and accurate.
  *
- * $Id: StockDB.java,v 1.2 2000/04/26 05:32:01 peter Exp $
+ * $Id: StockDB.java,v 1.3 2001/10/25 05:59:58 momjian Exp $
  */
 public class StockDB
 {
-    Connection con;
-    Statement st;
-    
-    // the current stock number
-    int id = -1;
-    
-    public void connect(String url,String usr,String pwd) throws Exception {
-	Class.forName("org.postgresql.Driver");
-	System.out.println("Connecting to "+url);
-	con = DriverManager.getConnection(url,usr,pwd);
-	st = con.createStatement();
-    }
-    
-    public void closeConnection() throws Exception {
-	con.close();
-    }
-    
-    public void fetchItem(int id) throws Exception {
-	this.id = id;
-    }
-    
-    public int newItem() throws Exception {
-	// tba
-	return -1;
-    }
-    
-    public String getDescription() throws SQLException {
-	ResultSet rs = st.executeQuery("select description from stock where id="+id);
-	if(rs!=null) {
-	    rs.next();
-	    String s = rs.getString(1);
-	    rs.close();
-	    return s;
+	Connection con;
+	Statement st;
+
+	// the current stock number
+	int id = -1;
+
+	public void connect(String url, String usr, String pwd) throws Exception
+	{
+		Class.forName("org.postgresql.Driver");
+		System.out.println("Connecting to " + url);
+		con = DriverManager.getConnection(url, usr, pwd);
+		st = con.createStatement();
 	}
-	throw new SQLException("No ResultSet");
-    }
-    
-    public int getAvailable() throws SQLException {
-	ResultSet rs = st.executeQuery("select avail from stock where id="+id);
-	if(rs!=null) {
-	    rs.next();
-	    int v = rs.getInt(1);
-	    rs.close();
-	    return v;
+
+	public void closeConnection() throws Exception
+	{
+		con.close();
 	}
-	throw new SQLException("No ResultSet");
-    }
-    
-    public int getOrdered() throws SQLException {
-	ResultSet rs = st.executeQuery("select ordered from stock where id="+id);
-	if(rs!=null) {
-	    rs.next();
-	    int v = rs.getInt(1);
-	    rs.close();
-	    return v;
+
+	public void fetchItem(int id) throws Exception
+	{
+		this.id = id;
 	}
-	throw new SQLException("No ResultSet");
-    }
-    
-    public boolean isItemValid() throws SQLException {
-	ResultSet rs = st.executeQuery("select valid from stock where id="+id);
-	if(rs!=null) {
-	    rs.next();
-	    boolean b = rs.getBoolean(1);
-	    rs.close();
-	    return b;
+
+	public int newItem() throws Exception
+	{
+		// tba
+		return -1;
 	}
-	throw new SQLException("No ResultSet");
-    }
-    
-    public void addNewStock(int amount) throws SQLException {
-	st.executeUpdate("update stock set avail=avail+"+amount+
-			 ", ordered=ordered-"+amount+
-			 " where id="+id+" and ordered>="+amount);
-    }
-    
-    public void removeStock(int amount) throws SQLException {
-	st.executeUpdate("update stock set avail=avail-"+amount+
-			 " where id="+id);
-    }
-    
-    public void orderStock(int amount) throws SQLException {
-	st.executeUpdate("update stock set ordered=ordered+"+amount+
-			 " where id="+id);
-    }
-    
-    public int getLastID() throws SQLException {
-	ResultSet rs = st.executeQuery("select max(id) from stock");
-	if(rs!=null) {
-	    rs.next();
-	    int v = rs.getInt(1);
-	    rs.close();
-	    return v;
+
+	public String getDescription() throws SQLException
+	{
+		ResultSet rs = st.executeQuery("select description from stock where id=" + id);
+		if (rs != null)
+		{
+			rs.next();
+			String s = rs.getString(1);
+			rs.close();
+			return s;
+		}
+		throw new SQLException("No ResultSet");
 	}
-	throw new SQLException("No ResultSet");
-    }
-    
+
+	public int getAvailable() throws SQLException
+	{
+		ResultSet rs = st.executeQuery("select avail from stock where id=" + id);
+		if (rs != null)
+		{
+			rs.next();
+			int v = rs.getInt(1);
+			rs.close();
+			return v;
+		}
+		throw new SQLException("No ResultSet");
+	}
+
+	public int getOrdered() throws SQLException
+	{
+		ResultSet rs = st.executeQuery("select ordered from stock where id=" + id);
+		if (rs != null)
+		{
+			rs.next();
+			int v = rs.getInt(1);
+			rs.close();
+			return v;
+		}
+		throw new SQLException("No ResultSet");
+	}
+
+	public boolean isItemValid() throws SQLException
+	{
+		ResultSet rs = st.executeQuery("select valid from stock where id=" + id);
+		if (rs != null)
+		{
+			rs.next();
+			boolean b = rs.getBoolean(1);
+			rs.close();
+			return b;
+		}
+		throw new SQLException("No ResultSet");
+	}
+
+	public void addNewStock(int amount) throws SQLException
+	{
+		st.executeUpdate("update stock set avail=avail+" + amount +
+						 ", ordered=ordered-" + amount +
+						 " where id=" + id + " and ordered>=" + amount);
+	}
+
+	public void removeStock(int amount) throws SQLException
+	{
+		st.executeUpdate("update stock set avail=avail-" + amount +
+						 " where id=" + id);
+	}
+
+	public void orderStock(int amount) throws SQLException
+	{
+		st.executeUpdate("update stock set ordered=ordered+" + amount +
+						 " where id=" + id);
+	}
+
+	public int getLastID() throws SQLException
+	{
+		ResultSet rs = st.executeQuery("select max(id) from stock");
+		if (rs != null)
+		{
+			rs.next();
+			int v = rs.getInt(1);
+			rs.close();
+			return v;
+		}
+		throw new SQLException("No ResultSet");
+	}
+
 }

src/interfaces/jdbc/example/corba/StockDispenserImpl.java

@@ -5,79 +5,88 @@ import org.omg.CosNaming.*;
 /**
  * This class implements the server side of the example.
  *
- * $Id: StockDispenserImpl.java,v 1.1 1999/01/25 21:22:03 scrappy Exp $
+ * $Id: StockDispenserImpl.java,v 1.2 2001/10/25 05:59:58 momjian Exp $
  */
 public class StockDispenserImpl extends stock._StockDispenserImplBase
 {
-    private int maxObjects = 10;
-    private int numObjects = 0;
-    private StockItemStatus[] stock = new StockItemStatus[maxObjects];
-    
-    public StockDispenserImpl(String[] args,String name,int num)
-    {
-	super();
-	
-	try {
-	    // get reference to orb
-	    org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args,null);
-	    
-	    // prestart num objects
-	    if(num>=maxObjects)
-		num=maxObjects;
-	    numObjects = num;
-	    for(int i=0;i<numObjects;i++) {
-		stock[i] = new StockItemStatus();
-		stock[i].ref = new StockItemImpl(args,"StockItem"+(i+1));
-		orb.connect(stock[i].ref);
-	    }
-	} catch(org.omg.CORBA.SystemException e) {
-	    e.printStackTrace();
+	private int maxObjects = 10;
+	private int numObjects = 0;
+	private StockItemStatus[] stock = new StockItemStatus[maxObjects];
+
+	public StockDispenserImpl(String[] args, String name, int num)
+	{
+		super();
+
+		try
+		{
+			// get reference to orb
+			org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null);
+
+			// prestart num objects
+			if (num >= maxObjects)
+				num = maxObjects;
+			numObjects = num;
+			for (int i = 0;i < numObjects;i++)
+			{
+				stock[i] = new StockItemStatus();
+				stock[i].ref = new StockItemImpl(args, "StockItem" + (i + 1));
+				orb.connect(stock[i].ref);
+			}
+		}
+		catch (org.omg.CORBA.SystemException e)
+		{
+			e.printStackTrace();
+		}
 	}
-    }
-    
-    /**
-     * This method, defined in stock.idl, reserves a slot in the dispenser
-     */
-    public stock.StockItem reserveItem() throws stock.StockException
-    {
-	for(int i=0;i<numObjects;i++) {
-	    if(!stock[i].inUse) {
-		stock[i].inUse = true;
-		System.out.println("Reserving slot "+i);
-		return stock[i].ref;
-	    }
+
+	/**
+	 * This method, defined in stock.idl, reserves a slot in the dispenser
+	 */
+	public stock.StockItem reserveItem() throws stock.StockException
+	{
+		for (int i = 0;i < numObjects;i++)
+		{
+			if (!stock[i].inUse)
+			{
+				stock[i].inUse = true;
+				System.out.println("Reserving slot " + i);
+				return stock[i].ref;
+			}
+		}
+		return null;
 	}
-	return null;
-    }
-    
-    /**
-     * This releases a slot from the dispenser
-     */
-    public void releaseItem(stock.StockItem item) throws stock.StockException
-    {
-	for(int i=0;i<numObjects;i++) {
-	    if(stock[i].ref.getInstanceName().equals(item.getInstanceName())) {
-		stock[i].inUse = false;
-		System.out.println("Releasing slot "+i);
-		return;
-	    }
+
+	/**
+	 * This releases a slot from the dispenser
+	 */
+	public void releaseItem(stock.StockItem item) throws stock.StockException
+	{
+		for (int i = 0;i < numObjects;i++)
+		{
+			if (stock[i].ref.getInstanceName().equals(item.getInstanceName()))
+			{
+				stock[i].inUse = false;
+				System.out.println("Releasing slot " + i);
+				return ;
+			}
+		}
+		System.out.println("Reserved object not a member of this dispenser");
+		return ;
 	}
-	System.out.println("Reserved object not a member of this dispenser");
-	return;
-    }
-    
-    /**
-     * This class defines a slot in the dispenser
-     */
-    class StockItemStatus
-    {
-	StockItemImpl ref;
-	boolean inUse;
-	
-	StockItemStatus() {
-	    ref = null;
-	    inUse = false;
+
+	/**
+	 * This class defines a slot in the dispenser
+	 */
+	class StockItemStatus
+	{
+		StockItemImpl ref;
+		boolean inUse;
+
+		StockItemStatus()
+		{
+			ref = null;
+			inUse = false;
+		}
 	}
-    }
-    
+
 }

src/interfaces/jdbc/example/corba/StockItemImpl.java

@@ -5,159 +5,204 @@ import org.omg.CosNaming.*;
 /**
  * This class implements the server side of the example.
  *
- * $Id: StockItemImpl.java,v 1.1 1999/01/25 21:22:04 scrappy Exp $
+ * $Id: StockItemImpl.java,v 1.2 2001/10/25 05:59:58 momjian Exp $
  */
 public class StockItemImpl extends stock._StockItemImplBase
 {
-    private StockDB db;
-    private String instanceName;
-    
-    public StockItemImpl(String[] args,String iname) {
-	super();
-	try {
-	    db =new StockDB();
-	    db.connect(args[1],args[2],args[3]);
-	    System.out.println("StockDB object "+iname+" created");
-	    instanceName = iname;
-	} catch(Exception e) {
-	    e.printStackTrace();
+	private StockDB db;
+	private String instanceName;
+
+	public StockItemImpl(String[] args, String iname)
+	{
+		super();
+		try
+		{
+			db = new StockDB();
+			db.connect(args[1], args[2], args[3]);
+			System.out.println("StockDB object " + iname + " created");
+			instanceName = iname;
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It sets the item to view
-     */
-    public void fetchItem(int id) throws stock.StockException {
-	try {
-	    db.fetchItem(id);
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It sets the item to view
+	 */
+	public void fetchItem(int id) throws stock.StockException
+	{
+		try
+		{
+			db.fetchItem(id);
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It sets the item to view
-     */
-    public int newItem() throws stock.StockException {
-	try {
-	    return db.newItem();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It sets the item to view
+	 */
+	public int newItem() throws stock.StockException
+	{
+		try
+		{
+			return db.newItem();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public String getDescription() throws stock.StockException {
-	try {
-	    return db.getDescription();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public String getDescription() throws stock.StockException
+	{
+		try
+		{
+			return db.getDescription();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public int getAvailable() throws stock.StockException {
-	try {
-	    return db.getAvailable();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public int getAvailable() throws stock.StockException
+	{
+		try
+		{
+			return db.getAvailable();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-        
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public int getOrdered() throws stock.StockException {
-	try {
-	    return db.getOrdered();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public int getOrdered() throws stock.StockException
+	{
+		try
+		{
+			return db.getOrdered();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public boolean isItemValid() throws stock.StockException {
-	try {
-	    return db.isItemValid();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public boolean isItemValid() throws stock.StockException
+	{
+		try
+		{
+			return db.isItemValid();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public void addNewStock(int id) throws stock.StockException {
-	try {
-	    db.addNewStock(id);
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public void addNewStock(int id) throws stock.StockException
+	{
+		try
+		{
+			db.addNewStock(id);
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public void removeStock(int id) throws stock.StockException {
-	try {
-	    db.removeStock(id);
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public void removeStock(int id) throws stock.StockException
+	{
+		try
+		{
+			db.removeStock(id);
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This is defined in stock.idl
-     *
-     * It returns the description of a Stock item
-     */
-    public void orderStock(int id) throws stock.StockException {
-	try {
-	    db.orderStock(id);
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This is defined in stock.idl
+	 *
+	 * It returns the description of a Stock item
+	 */
+	public void orderStock(int id) throws stock.StockException
+	{
+		try
+		{
+			db.orderStock(id);
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
 	}
-    }
-    
-    /**
-     * This returns the highest id used, hence the number of items available
-     */
-    public int getLastID() throws stock.StockException {
-	try {
-	    return db.getLastID();
-	} catch(Exception e) {
-	    throw new stock.StockException(e.toString());
+
+	/**
+	 * This returns the highest id used, hence the number of items available
+	 */
+	public int getLastID() throws stock.StockException
+	{
+		try
+		{
+			return db.getLastID();
+		}
+		catch (Exception e)
+		{
+			throw new stock.StockException(e.toString());
+		}
+	}
+
+	/**
+	 * This is used by our Dispenser
+	 */
+	public String getInstanceName()
+	{
+		return instanceName;
 	}
-    }
-    
-    /**
-     * This is used by our Dispenser
-     */
-    public String getInstanceName() {
-	return instanceName;
-    }
 }
-	
+

src/interfaces/jdbc/example/corba/StockServer.java

@@ -5,49 +5,54 @@ import org.omg.CosNaming.*;
 /**
  * This class implements the server side of the example.
  *
- * $Id: StockServer.java,v 1.1 1999/01/25 21:22:04 scrappy Exp $
+ * $Id: StockServer.java,v 1.2 2001/10/25 05:59:58 momjian Exp $
  */
 public class StockServer
 {
-    public static void main(String[] args)
-    {
-	int numInstances = 3;
-	
-	try {
-	    // Initialise the ORB
-	    org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args,null);
-	    
-	    // Create the StockDispenser object
-	    StockDispenserImpl dispenser = new StockDispenserImpl(args,"Stock Dispenser",numInstances);
-	    
-	    // Export the new object
-	    orb.connect(dispenser);
-	    
-	    // Get the naming service
-	    org.omg.CORBA.Object nameServiceObj = orb.resolve_initial_references("NameService");
-	    if(nameServiceObj == null) {
-		System.err.println("nameServiceObj = null");
-		return;
-	    }
-	    
-	    org.omg.CosNaming.NamingContext nameService = org.omg.CosNaming.NamingContextHelper.narrow(nameServiceObj);
-	    if(nameService == null) {
-		System.err.println("nameService = null");
-		return;
-	    }
-	    
-	    // bind the dispenser into the naming service
-	    NameComponent[] dispenserName = {
-		new NameComponent("StockDispenser","Stock")
-	    };
-	    nameService.rebind(dispenserName,dispenser);
-	    
-	    // Now wait forever for the current thread to die
-	    Thread.currentThread().join();
-	} catch(Exception e) {
-	    e.printStackTrace();
+	public static void main(String[] args)
+	{
+		int numInstances = 3;
+
+		try
+		{
+			// Initialise the ORB
+			org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null);
+
+			// Create the StockDispenser object
+			StockDispenserImpl dispenser = new StockDispenserImpl(args, "Stock Dispenser", numInstances);
+
+			// Export the new object
+			orb.connect(dispenser);
+
+			// Get the naming service
+			org.omg.CORBA.Object nameServiceObj = orb.resolve_initial_references("NameService");
+			if (nameServiceObj == null)
+			{
+				System.err.println("nameServiceObj = null");
+				return ;
+			}
+
+			org.omg.CosNaming.NamingContext nameService = org.omg.CosNaming.NamingContextHelper.narrow(nameServiceObj);
+			if (nameService == null)
+			{
+				System.err.println("nameService = null");
+				return ;
+			}
+
+			// bind the dispenser into the naming service
+			NameComponent[] dispenserName = {
+												new NameComponent("StockDispenser", "Stock")
+											};
+			nameService.rebind(dispenserName, dispenser);
+
+			// Now wait forever for the current thread to die
+			Thread.currentThread().join();
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
 	}
-    }
 }
 
-	    
+