Changeset 2210 for trunk/java-client

Timestamp:

2001-03-20T19:16:07+12:00 (23 years ago)

Author:

daven

Message:

improved collection information dialog with HTML display
of long collection descriptions

Location:

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

Files:

• CollectionInfoDialog.java (modified) (4 diffs)
• SearchPanel.java (modified) (1 diff)

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

@@ -38 +38 @@
 
 import javax.swing.*;
+import javax.swing.text.*;
+import javax.swing.text.html.*;
 import java.awt.*;
 import java.awt.event.*;
 import java.util.*;
 import java.text.*;
+import java.io.*;
 
 import org.nzdl.gsdl.service.*;
 
-public class CollectionInfoDialog extends JDialog implements ActionListener {
+public class CollectionInfoDialog extends JDialog implements ActionListener, Constants {
 
 private JButton okButton;
-private JPanel  buttonPanel, holderPanel, contentPanel;
-    private String publicString, betaString;
-    private JLabel sizeLabel;
-
-CollectionInfoDialog(Frame f, String collectionName, CSModel csModel) {
+private JPanel  buttonPanel, holderPanel, contentPanel, collectionNamePanel;
+private String publicString, betaString;
+private String fullCollectionName = "";
+private String descString = "";
+private NumberFormat numFormat = NumberFormat.getInstance();
+
+CollectionInfoDialog(Frame f, String collectionName, NzdlService nzdl) {
     super(f, "Collection Information" );
 
     contentPanel = new JPanel(new GridLayout(0,2, 5, 4));;
-            
     buttonPanel = new JPanel();
 
-    JLabel prefTitle = new JLabel(collectionName, SwingConstants.CENTER);
-    prefTitle.setAlignmentX(JLabel.CENTER_ALIGNMENT);
-    JPanel prefTitlePanel = new JPanel();
-    prefTitlePanel.add(prefTitle);
-
-    NzdlCollectionInfo collectionInfo =  csModel.getNzdlService().getCollectionInfo(collectionName);
-
-    contentPanel.add(new JLabel("Collection:"));
+    NzdlCollectionInfo collectionInfo =  nzdl.getCollectionInfo(collectionName);
+    Set n = nzdl.getMetaData(collectionName, "collection", "collectionname");
+      if (n.size() == 1) {
+    fullCollectionName =  (String) n.toArray()[0];
+     }
+    else {
+    System.err.println(collectionName + " has more than 1 collectionname");
+    }
+    n.clear();
+
+    collectionNamePanel = new JPanel();
+    // collectionNamePanel.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+    collectionNamePanel.add(new JLabel(fullCollectionName));
+
+    contentPanel.add(new JLabel("Short collection name:"));
     JLabel collectionLabel = new JLabel(collectionName);
     contentPanel.add(collectionLabel);
     contentPanel.add(new JLabel("Number of Documents:"));
-    contentPanel.add(new JLabel("" + collectionInfo.getNumOfDocs()));
+    String numOfDocs = numFormat.format( collectionInfo.getNumOfDocs());
+    contentPanel.add(new JLabel(numOfDocs));
     contentPanel.add(new JLabel("Number of Words:"));
-    contentPanel.add(new JLabel("" +  collectionInfo.getNumOfWords()));
+    String numOfWords = numFormat.format( collectionInfo.getNumOfWords());
+    contentPanel.add(new JLabel(numOfWords));
     contentPanel.add(new JLabel("Size:"));
     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(formatByteSize(numOfBytes)));
     contentPanel.add(new JLabel("Last built on:"));
     Date buildDate = new Date( collectionInfo.getBuildDate()*1000);
@@ -99 +106 @@
     contentPanel.add(new JLabel(betaString));
 
+    JPanel descPanel = new JPanel();
+    Set descSet = nzdl.getMetaData(collectionName, "collection", "collectionextra");
+    if (descSet.size() == 1) {
+    descString = (String) descSet.toArray()[0];
+    //System.err.println(descString);
+    if (descString.length() > 0) {
+        descPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,2,5,2), BorderFactory.createTitledBorder("Description")));
+        JTextPane descPane = new JTextPane();
+        HTMLEditorKit htmlEditorKit = new HTMLEditorKit();
+        HTMLDocument htmlDoc = new HTMLDocument();
+        descPane.setEditorKit(htmlEditorKit);
+        try {
+        htmlEditorKit.read(new StringReader(descString), htmlDoc, 0); 
+        }
+        catch (Exception e) {
+        System.err.println(e);
+        }
+        descPane.setEditable(false);
+        descPane.setFont(docFont);
+        descPane.setDocument(htmlDoc);
+        descPane.setCaretPosition(1); // we know descString.length() > 0
+        JScrollPane scrollPane = new JScrollPane(descPane);
+        scrollPane.setPreferredSize(new Dimension(420, 130));
+        descPanel.add(scrollPane);
+    } // if
+    } // if 
+    descSet.clear();
+
     okButton = new JButton("Ok");
     okButton.setPreferredSize(new Dimension(80,20));
@@ -104 +139 @@
     buttonPanel.add( okButton );
     getRootPane().setDefaultButton(okButton);
-
+    
     holderPanel = new JPanel();
     holderPanel.setBorder(BorderFactory.createEmptyBorder(10,10,2,10));
-    holderPanel.setLayout( new BorderLayout());
-    holderPanel.add( contentPanel, BorderLayout.NORTH);
-    holderPanel.add( buttonPanel, BorderLayout.SOUTH);
+    holderPanel.setLayout( new BoxLayout(holderPanel, BoxLayout.Y_AXIS));
+    holderPanel.add(collectionNamePanel);
+    holderPanel.add(contentPanel);
+    if (descString.length() > 0) {
+    holderPanel.add(Box.createVerticalStrut(10));
+    holderPanel.add(descPanel); // only if we have a description to show
+    }
+    holderPanel.add(Box.createVerticalStrut(5));
+    holderPanel.add(buttonPanel);
     getContentPane().add(holderPanel);
-    //setSize(new Dimension(300,300));
-
     pack();
     setVisible(true);
-} //end CollectionInfoDialog constructor
+    } //end CollectionInfoDialog constructor
 
 
@@ -133 +172 @@
 } //end actionPerformed
 
+
+    /* generate a string with correct sizing information */
+    /* bytes, K or G */
+    public String formatByteSize (long numberOfBytes) {
+    int minfd = numFormat.getMinimumFractionDigits();
+    int maxfd = numFormat.getMaximumFractionDigits();
+    String resultString;
+    numFormat.setMinimumFractionDigits(1);
+    numFormat.setMaximumFractionDigits(1);
+    if (numberOfBytes > 1073741824)
+         resultString =  numFormat.format((numberOfBytes / (float)1073741824)) + " G";
+    else 
+        if (numberOfBytes > 1048576)
+        resultString = numFormat.format((numberOfBytes / (float)1048576)) + " M";
+        else {
+        numFormat.setMinimumFractionDigits(0);
+        numFormat.setMaximumFractionDigits(0);
+        if (numberOfBytes > 1024)
+            resultString = numFormat.format((numberOfBytes / (float)1024)) + " K";
+            else
+            resultString =  numFormat.format(numberOfBytes) + " bytes";
+        }
+    numFormat.setMinimumFractionDigits(minfd);
+    numFormat.setMaximumFractionDigits(maxfd);
+        return resultString;
+} // end formatByteSize
+
+
+
 } // end CollectionInfoDialog class

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

@@ -252 +252 @@
     if (e.getSource() == collectionInfoButton) {
         //System.err.println("colllection info button pressed");
-        CollectionInfoDialog cid = new CollectionInfoDialog(windowParent, collectionList.getSelectedItem().toString(), csModel);
+        CollectionInfoDialog cid = new CollectionInfoDialog(windowParent, collectionList.getSelectedItem().toString(), nzdl);
     }
     else {