aboutsummaryrefslogtreecommitdiff
path: root/src/uk/org/ury/library/viewer/LibraryViewer.java
diff options
context:
space:
mode:
authorMatt Windsor <mbw500@student.cs.york.ac.uk>2011-02-20 23:49:42 +0000
committerMatt Windsor <mbw500@student.cs.york.ac.uk>2011-02-20 23:49:42 +0000
commitcd972012ab8c40b66bd65f78bbf9e3422413b1aa (patch)
tree726aa9cefa80fc4a2f3922ed6e05cf0074421a6d /src/uk/org/ury/library/viewer/LibraryViewer.java
parente2fc92f5c42dde942e8b71d38b9745b6f3c98053 (diff)
parentf89ef9ed36e8185f53c7d5f22f91935e2c4ccaa0 (diff)
Merge. DatabaseLogin over. Auth = Very Yes.
Diffstat (limited to 'src/uk/org/ury/library/viewer/LibraryViewer.java')
-rw-r--r--src/uk/org/ury/library/viewer/LibraryViewer.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/uk/org/ury/library/viewer/LibraryViewer.java b/src/uk/org/ury/library/viewer/LibraryViewer.java
index 970235a..a631e89 100644
--- a/src/uk/org/ury/library/viewer/LibraryViewer.java
+++ b/src/uk/org/ury/library/viewer/LibraryViewer.java
@@ -31,6 +31,7 @@ public class LibraryViewer extends AbstractFrontendModule
private List<LibraryItem> libraryList;
private LibraryViewerPanel panel;
private FrontendFrame frame;
+ private static ConfigReader config;
/**
@@ -43,7 +44,12 @@ public class LibraryViewer extends AbstractFrontendModule
public static void
main (String[] args)
{
- new ConfigReader();
+ try {
+ config = new ConfigReader("res/conf.xml");
+ }
+ catch(MissingCredentialsException e) {
+ System.out.println(e);
+ }
LibraryViewer lv = new LibraryViewer ();
lv.runFrontendInFrame ();
}
@@ -141,7 +147,7 @@ public class LibraryViewer extends AbstractFrontendModule
try
{
- dd = new DatabaseDriver (UserClass.READ_ONLY);
+ dd = new DatabaseDriver(config, UserClass.READ_ONLY);
}
catch (MissingCredentialsException e)
{