Changeset 2197

Timestamp:

2001-03-20T10:13:44+12:00 (23 years ago)

Author:

daven

Message:

tidying up CollectionInfoDialog

Location:

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient

Files:

• CSFrame.java (modified) (1 diff)
• CollectionInfoDialog.java (modified) (2 diffs)

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CSFrame.java

@@ -1 +1 @@
 
 /*
- *    SimpleGraphicalClient.java
+ *    CSFrame.java
  *    Copyright (C) 2001 New Zealand Digital Library Project
  *

trunk/java-client/org/nzdl/gsdl/SimpleGraphicalClient/CollectionInfoDialog.java

@@ -50 +50 @@
 private JPanel  buttonPanel, holderPanel, contentPanel;
     private String publicString, betaString;
+    private JLabel sizeLabel;
 
 CollectionInfoDialog(Frame f, String collectionName, CSModel csModel) {
@@ -73 +74 @@
     contentPanel.add(new JLabel("" +  collectionInfo.getNumOfWords()));
     contentPanel.add(new JLabel("Size:"));
-    contentPanel.add(new JLabel((collectionInfo.getNumOfBytes() / 1024) + "K"));
+    long numOfBytes = collectionInfo.getNumOfBytes();
+    if (numOfBytes > 1023) {
+    sizeLabel = new JLabel((numOfBytes / 1024) + " K");
+    }
+    else {
+    sizeLabel = new JLabel(numOfBytes + " bytes");
+    }
+    contentPanel.add(sizeLabel);
     contentPanel.add(new JLabel("Last built on:"));
     Date buildDate = new Date( collectionInfo.getBuildDate()*1000);
     contentPanel.add(new JLabel(DateFormat.getDateTimeInstance().format(buildDate)));
-    Date now = new Date();
-    Date now2 = new Date(now.getTime());
-    System.err.println("Build date =\t " + collectionInfo.getBuildDate()*1000 + "\nNow is = \t" +  now.getTime());
-    contentPanel.add(new JLabel("Today is:"));
-    contentPanel.add( new JLabel(DateFormat.getDateTimeInstance().format(now2)));
     contentPanel.add(new JLabel("Is it Public?"));