Changeset 2184 for trunk/java-client/org

Timestamp:

2001-03-15T20:39:37+13:00 (23 years ago)

Author:

daven

Message:

preferences dialog added

Location:

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

Files:

• CSFrame.java (modified) (9 diffs)
• CSModel.java (modified) (1 diff)
• Constants.java (modified) (2 diffs)
• GMLDocument.java (modified) (3 diffs)
• SearchPanel.java (modified) (5 diffs)
• SimpleGraphicalClient.java (modified) (1 diff)

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

@@ +1 @@
+
 /*
  *    SimpleGraphicalClient.java
@@ -71 +72 @@
     // File Menu
 
-    //fileMenu.add( newSpaceAction = new FileAction("New Space", NEW_SPACE_ID)).setAccelerator(KeyStroke.getKeyStroke('S', Event.CTRL_MASK));;
-    //fileMenu.add( newGroupAction = new FileAction("New Group", NEW_GROUP_ID)).setAccelerator(KeyStroke.getKeyStroke('G', Event.CTRL_MASK));;
-    //fileMenu.add( newPersonAction = new FileAction("New Person", NEW_PERSON_ID)).setAccelerator(KeyStroke.getKeyStroke('P', Event.CTRL_MASK));
     //fileMenu.addSeparator();
-    fileMenu.add( quitAction = new FileAction("Poll Server", POLL_ID)).setAccelerator(KeyStroke.getKeyStroke('P', Event.CTRL_MASK));;
-    fileMenu.add( quitAction = new FileAction("Collect Garbage", GARBAGE_ID)).setAccelerator(KeyStroke.getKeyStroke('G', Event.CTRL_MASK));;
-    fileMenu.add( quitAction = new FileAction("Quit", QUIT_ID)).setAccelerator(KeyStroke.getKeyStroke('Q', Event.CTRL_MASK));;
-
-
-    editMenu.add( infoAction = new EditAction("Info...", INFO_ID));
-    editMenu.add( editAction = new EditAction("Edit...", EDIT_ID));
+    fileMenu.add( quitAction = new FileAction("Poll Server", POLL_ID, this)).setAccelerator(KeyStroke.getKeyStroke('P', Event.CTRL_MASK));
+    fileMenu.add( quitAction = new FileAction("Collect Garbage", GARBAGE_ID, this)).setAccelerator(KeyStroke.getKeyStroke('G', Event.CTRL_MASK));
+    fileMenu.add( quitAction = new FileAction("Quit", QUIT_ID, this)).setAccelerator(KeyStroke.getKeyStroke('Q', Event.CTRL_MASK));
+
+    // Edit Menu
+
+    editMenu.add( prefAction = new EditAction("Preferences", PREF_ID, this));
+
     
     menuBar.add(fileMenu);                        // Add the file menu
-    // menuBar.add(editMenu);                        // Add the edit menu
+    menuBar.add(editMenu);                        // Add the edit menu
     
     
     searchPanel = new SearchPanel(csModel, this);
-    otherPanel = new JPanel();
-    
+        
     content.setLayout(new BoxLayout(content, BoxLayout.X_AXIS));    
     content.add(searchPanel);
     
-    //csModel.addObserver(this);
-    addWindowListener(new WindowHandler());
-    //jlist.addMouseListener( new MouseHandler(this));
-    
+        addWindowListener(new WindowHandler());
+        
     pack();
     searchPanel.searchTextField.requestFocus();
@@ -112 +108 @@
   // action objects
 
-  abstract class CSAction extends AbstractAction
-  {
-   int menuItemID;
-  
-          CSAction( String name, int newMenuItemID)
+  abstract class CSAction extends AbstractAction {
+      int menuItemID;
+      Frame frame;
+  
+          CSAction( String name, int newMenuItemID, Frame f)
           {
             super(name);
             menuItemID = newMenuItemID;
+            frame = f;
            }
            
@@ -128 +125 @@
   class FileAction extends CSAction
   {
-        FileAction(String name, int newMenuItemID)
+        FileAction(String name, int newMenuItemID, Frame frame)
         {
-             super(name,newMenuItemID );
+             super(name,newMenuItemID, frame );
          }
 
@@ -136 +133 @@
          {
          switch (menuItemID) {
-                case NEW_PERSON_ID:
-                     System.out.println("new person chosen from menu");
-                     Frame f = new Frame();
-                     //newPersonDialog = new NewPersonDialog(f, psModel);
-                     break;
-                case NEW_SPACE_ID:
-                     System.out.println("new space chosen from menu");
-                     break;
-                case NEW_GROUP_ID:
-                     System.out.println("new group chosen from menu");
-                     break; 
-         case GARBAGE_ID:
+                 case GARBAGE_ID:
            System.err.println("forcing gc...");
            System.gc() ;
@@ -173 +159 @@
   class EditAction extends CSAction 
   {
-        EditAction(String name, int newMenuItemID)
+        EditAction(String name, int newMenuItemID, Frame frame)
         {
-             super(name,newMenuItemID );
+             super(name,newMenuItemID, frame );
          }
 
@@ -181 +167 @@
          {
          switch (menuItemID) {
-                case INFO_ID:
-                     System.out.println("info Action chosen");
-                     break;
-                case EDIT_ID:
-                     System.out.println("edit Action chosen");
+                case PREF_ID:
+                     PreferencesDialog prefDialog = new PreferencesDialog(frame, "Preferences", false); // make this the instance of CSFrame
                      break;
                 default:
@@ -258 +241 @@
   // private declarations
   private JMenuBar menuBar = new JMenuBar();      // Window menu bar
-  private JMenuItem newSpaceItem, newGroupItem, newPersonItem, quitItem;
+  private JMenuItem  quitItem;
   
  private JList jlist, peopleList;
@@ -268 +251 @@
   // EditActions
   
-  private EditAction infoAction, editAction, weightsAction;
+  private EditAction prefAction;
 
   //Dialog
 
-  //private NewPersonDialog newPersonDialog;
+  private PreferencesDialog newPreferencesDialog;
   
 } //end CSFrame

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

@@ -143 +143 @@
       } // end else
     } // end while  
+
+    
+
     setCurrentCollection(getFirstCollection()); //assume at least one collection
     

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

@@ -41 +41 @@
 /* File Menu */
 
-  final static int  NEW_PERSON_ID           = 101;
-  final static int  NEW_GROUP_ID            = 102;
-  final static int  NEW_SPACE_ID            = 103;
   final static int  QUIT_ID             = 104;
   final static int  POLL_ID             = 105;
@@ -50 +47 @@
 /* Edit Menu */
 
-  final static int INFO_ID              = 201;
-  final static int EDIT_ID                  = 202;
-  final static int WEIGHTS_ID               = 207;
-
+  final static int PREF_ID              = 201;
 
 

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

@@ -24 +24 @@
 
 
+import org.nzdl.gsdl.service.*;
+
 /**
  * Class GMLDocument
@@ -42 +44 @@
 
 
-    public void getImageData() {
+    public void getImageData(NzdlService nzdl, String collectionName) {
     // display image data
     System.err.println("about to get iterator ...");
-    HTML.Tag tag = HTML.Tag.A;
+    /* 
+       HTML.Tag tag = HTML.Tag.IMG;
     
-    HTMLDocument.Iterator it = getIterator(tag);
+       HTMLDocument.Iterator it = getIterator(tag); */
+    //System.err.println("collectionName = " + collectionName);
+    //System.err.println("HTTPPrefix = " + nzdl.getCollectionInfo(collectionName).getHTTPPrefix());
+    //System.err.println("HTTPDomain = " + nzdl.getCollectionInfo(collectionName).getHTTPDomain());
+
+    ElementIterator iterator = new ElementIterator(this);
+
+    Element element;
+
+    while ((element = iterator.next()) != null) {
+        // System.err.println("Got an element, getName() = " + element.getName() );
+        if (element.getName() == "img") {
+        //System.err.println("Got an image tag!");
+        AttributeSet attributes = element.getAttributes();
+        System.err.println("Num of attributes = " + attributes.getAttributeCount());
+        //Enumeration attributeNames = attributes.getAttributeNames();
+        for (Enumeration attributeNames = attributes.getAttributeNames()                      ; attributeNames.hasMoreElements() ;) {
+            Object attributeName = attributeNames.nextElement();
+            Object attributeValue = attributes.getAttribute(attributeName);
+            System.err.println("\t" + attributeName + " = " + attributeValue);
+        }
+        
+        Object name = attributes.getAttribute(StyleConstants.NameAttribute);
+        //System.err.println("name = " + name);
+        }
+        
+        }
+
+    /*
     if (it.getTag() == null) System.err.println("iterator is null");
     System.err.println("got iterator for tag type:" + it.getTag());
@@ -74 +105 @@
     System.err.println("no more " + it.getTag() + " tags");
     System.err.println("tag " + tag + " has block status " + tag.isBlock());
-
+    */
     }
 

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

@@ -225 +225 @@
       csModel.addResult(new Result((String)titleMap.get(resultDocID), resultDocID, collectionName ));
     } //end while
-    resultsList.setSelectedIndex(0);
+    resultsList.setSelectedIndex(0); // should be under Preference control!
       } // end else
       titleMap.clear();
@@ -272 +272 @@
       Date d1 = new Date();
       Date d2 = new Date();
+      Date d21 = new Date();
       Date d3 = new Date();
       try { // get the document and read it in as HTML
@@ -279 +280 @@
           //long ddiff1 = d2.getTime() - d1.getTime();
           // System.err.println("getDocument = " + ddiff1 + "ms");
-          htmlEditorKit.read( new StringReader(docContents), htmlDoc, 0);
+           StringReader sr = new StringReader(docContents);
+           d21 = new Date();
+           htmlEditorKit.read( sr, htmlDoc, 0); // should be under preference control!
            d3 = new Date();
           //long ddiff2 = d3.getTime() - d2.getTime();
@@ -297 +300 @@
       long diff = t2.getTime() - t1.getTime();
       long ddiff1 = d2.getTime() - d1.getTime();
-      long ddiff2 = d3.getTime() - d2.getTime();
+      long ddiff2 = d21.getTime() - d2.getTime();
+      long ddiff3 = d3.getTime() - d21.getTime();
       System.err.println("nzdl.getDocument = " + ddiff1 + "ms");
-      System.err.println("StringReader() = " + ddiff2 + "ms");
+      System.err.println("StringReader() constructor = " + ddiff2 + "ms");
+      System.err.println("EditorKit.read() = " + ddiff3 + " ms");
       System.err.println("getDocument total = " + diff + " ms");
       
@@ -317 +322 @@
 
       //System.err.println("getting image data...");
-      //      htmlDoc.getImageData();
+          htmlDoc.getImageData(nzdl, result.getCollectionName());
       windowParent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
       Date endTime = new Date();
       long diff5 = endTime.getTime() - startTime.getTime();
       System.err.println("total time " + diff5 + " ms");
+      //System.err.println("prefix = " + nzdl.getCollectionInfo(result.getCollectionName()).getHTTPPrefix());
       }
     } //end valueChanged

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

@@ +1 @@
+
 
 /*