Rewrite of server to use HttpCore example code; beginning of code reformat from GNU style to Java conventions. Code now includes Apache license code.

1 files changed, 89 insertions, 116 deletions

diff --git a/src/uk/org/ury/show/viewer/ShowViewer.java b/src/uk/org/ury/show/viewer/ShowViewer.java
index 24e696b..d11e8d5 100644
--- a/src/uk/org/ury/show/viewer/ShowViewer.java
+++ b/src/uk/org/ury/show/viewer/ShowViewer.java
@@ -1,3 +1,14 @@
+/*
+ * ShowViewer.java
+ * ---------------
+ * 
+ * Part of the URY Frontend Platform
+ * 
+ * V0.00  2011/03/20
+ * 
+ * (C) 2011 URY Computing
+ */
+
 package uk.org.ury.show.viewer;
 
 import java.util.List;
@@ -11,135 +22,97 @@ import uk.org.ury.frontend.AbstractFrontendModule;
 import uk.org.ury.frontend.FrontendMaster;
 import uk.org.ury.frontend.FrontendModulePanel;
 import uk.org.ury.frontend.exceptions.UICreationFailureException;
-
 import uk.org.ury.show.ShowChannel;
 import uk.org.ury.show.ShowUtils;
 import uk.org.ury.show.item.ShowItem;
 
-
 /**
  * Frontend module for viewing show details.
  * 
- * This serves as the base for the show playout and editor classes,
- * but can be used stand-alone as an (admittedly rather pointless) 
- * module.
+ * This serves as the base for the show playout and editor classes, but can be
+ * used stand-alone as an (admittedly rather pointless) module.
+ * 
+ * @author Matt Windsor
  * 
- * @author  Matt Windsor
- *
  */
+public class ShowViewer extends AbstractFrontendModule {
+    /**
+     * 
+     */
 
-public class ShowViewer extends AbstractFrontendModule
-{
-  /**
-   * 
-   */
-  
-  private static final long serialVersionUID = -2782366476480563739L;
-  private DatabaseDriver dd;
-  private ShowChannel[] channels;
-  private ShowViewerPanel panel;
-  private ConfigReader config;
-  
-  
-  /**
-   * Construct a new ShowViewer as a frontend object.
-   */
-  
-  public
-  ShowViewer ()
-  {
-    channels = new ShowChannel[ShowUtils.NUM_CHANNELS];
-  }
-  
-  
-  /**
-   * Run the library viewer frontend.
-   */
-  
-  @Override
-  public FrontendModulePanel
-  runFrontend (FrontendMaster master)
-  { 
-    dd = null;
-    config = null;
-    
-    try
-    {
-      config = new ConfigReader (master.getResourceDirectory () + "conf.xml");
-    }
-    catch (MissingCredentialsException e)
-    {
-      System.out.println(e);
+    private static final long serialVersionUID = -2782366476480563739L;
+    private DatabaseDriver dd;
+    private ShowChannel[] channels;
+    private ShowViewerPanel panel;
+    private ConfigReader config;
+
+    /**
+     * Construct a new ShowViewer as a frontend object.
+     */
+    public ShowViewer() {
+	channels = new ShowChannel[ShowUtils.NUM_CHANNELS];
     }
-  
-    
-    
-    try
-      {
-        dd = new DatabaseDriver (config, UserClass.READ_ONLY);
-      }
-    catch (MissingCredentialsException e)
-      {
-        // TODO: Privilege de-escalation
-        master.fatalError (e.getMessage ());
-      }
-    catch (Exception f)
-      {
-        master.fatalError (f.getMessage ());
-      }
-    
-    for (int i = 0; i < channels.length; i++)
-      {
-        channels[i] = new ShowChannel ();
-        
-        try
-          {
-            for (ShowItem item : ShowUtils.getChannelList (dd, 4696, i))
-              {
-                channels[i].add (item);
-              }
-          }
-        catch (QueryFailureException e)
-          {
-            master.fatalError (e.getMessage ());
-          }
-      }
-    
-    try
-      {
-        panel = new ShowViewerPanel (this, master);
-      }
-    catch (UICreationFailureException e)
-      {
-        master.fatalError (e.getMessage ());
-      }
-    
-    return panel;
-  }
 
+    /**
+     * Run the library viewer frontend.
+     */
+    @Override
+    public FrontendModulePanel runFrontend(FrontendMaster master) {
+	dd = null;
+	config = null;
+
+	try {
+	    config = new ConfigReader(master.getResourceDirectory()
+		    + "conf.xml");
+	} catch (MissingCredentialsException e) {
+	    System.out.println(e);
+	}
+
+	try {
+	    dd = new DatabaseDriver(config, UserClass.READ_ONLY);
+	} catch (MissingCredentialsException e) {
+	    // TODO: Privilege de-escalation
+	    master.fatalError(e.getMessage());
+	} catch (Exception f) {
+	    master.fatalError(f.getMessage());
+	}
 
-  /**
-   * @return  the channel array.
-   */
-  
-  public ShowChannel[]
-  getChannels ()
-  {
-    // TODO Auto-generated method stub
-    return channels;
-  }
+	for (int i = 0; i < channels.length; i++) {
+	    channels[i] = new ShowChannel();
 
-  
-  /**
-   * @return  the list of bin names.
-   * 
-   * @throws  QueryFailureException if the underlying database query
-   *          fails.
-   */
+	    try {
+		for (ShowItem item : ShowUtils.getChannelList(dd, 4696, i)) {
+		    channels[i].add(item);
+		}
+	    } catch (QueryFailureException e) {
+		master.fatalError(e.getMessage());
+	    }
+	}
 
-  public List<String>
-  getBins () throws QueryFailureException
-  {
-    return ShowUtils.getPublicFolders (dd);
-  }
+	try {
+	    panel = new ShowViewerPanel(this, master);
+	} catch (UICreationFailureException e) {
+	    master.fatalError(e.getMessage());
+	}
+
+	return panel;
+    }
+
+    /**
+     * @return the channel array.
+     */
+    public ShowChannel[] getChannels() {
+	// TODO Auto-generated method stub
+	return channels;
+    }
+
+    /**
+     * @return the list of bin names.
+     * 
+     * @throws QueryFailureException
+     *             if the underlying database query fails.
+     */
+    public List<String> getBins() throws QueryFailureException {
+	return ShowUtils.getPublicFolders(dd);
+    }
 }