[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Jul 19 11:36:24 EDT 2005
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool
In directory pub.open-bio.org:/tmp/cvs-serv20605/org/biomoby/client/ui/graphical/applets/objectCreationTool

Modified Files:
	TreeWindow.java ObjectCreationTool.java retrieveObjectXML.cgi 
	Registration.java 
Log Message:
Changed code that refered to the old registry. As well, removed the ability to register datatypes with "" articlenames. Eddie

moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool TreeWindow.java,1.1,1.2 ObjectCreationTool.java,1.2,1.3 retrieveObjectXML.cgi,1.1,1.2 Registration.java,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/TreeWindow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/TreeWindow.java	2005/04/07 16:42:26	1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/TreeWindow.java	2005/07/19 15:36:24	1.2
@@ -46,7 +46,7 @@
     private int type;
     private ObjectCreationTool tool = null;
     // TODO - place the file pointed to by _URL on mobycentral/cgi-bin/applets/
-    private final static String _URL = "http://mobycentral.cbr.nrc.ca/cgi-bin/applets/retrieveObjectXML.cgi?name=";
+    private final static String _URL = "http://mobycentral.icapture.ubc.ca:8090/applets/cgi-bin/retrieveObjectXML.cgi?name=";
 	/**
 	 * This is the default constructor
 	 */
@@ -119,16 +119,24 @@
 				        case (2):
 				        {
 				            articleName = getSelected();
+				            if (articleName.equalsIgnoreCase("")) {
+				            	tool.createPopUpMsg("Please enter an article name for your object selection.");
+				            	return;
+				            }
 				            tool.xml.addHas(selectedObject.toString(), articleName,tool.xml.getRootName());
-			                tool.toggleIsaButton(false);
+			                //tool.toggleIsaButton(false);
 			                tool.closePopUpTreeWindow();
 				        }
 				        break;
 				        case (3):
 				        {
 				            articleName = getSelected();
+				            if (articleName.equalsIgnoreCase("")) {
+				            	tool.createPopUpMsg("Please enter an article name for your object selection.");
+				            	return;
+				            }
 				            tool.xml.addHasA(selectedObject.toString(), articleName,tool.xml.getRootName());
-			                tool.toggleIsaButton(false);
+				            //tool.toggleIsaButton(false);
 			                tool.closePopUpTreeWindow();
 				        }
 				        break;

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/ObjectCreationTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/ObjectCreationTool.java	2005/06/02 15:48:01	1.2
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/ObjectCreationTool.java	2005/07/19 15:36:24	1.3
@@ -145,7 +145,7 @@
         final TreeLoaderThread worker = new TreeLoaderThread() {
             public Object construct() {
                 tree = new MobyTree(false,
-                        "http://mobycentral.cbr.nrc.ca:8090/RESOURCES/MOBY-S/Objects","Objects");
+                        "http://mobycentral.icapture.ubc.ca:8090/RESOURCES/MOBY-S/Objects","Object");
                 tree.makeObjectTree("Object");
                 tree.setPreferredSize(new Dimension(400, 400));
                 tree.getTree().addMouseListener(mListener);

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/retrieveObjectXML.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/retrieveObjectXML.cgi	2005/04/07 16:42:26	1.1
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/retrieveObjectXML.cgi	2005/07/19 15:36:24	1.2
@@ -4,7 +4,10 @@
 use strict;
 use CGI qw( :cgi );
 use MOBY::Client::Central;
-	my $Central = MOBY::Client::Central->new; 
+	my $Central = MOBY::Client::Central->new(Registries => {mobycentral => {
+                                 URL => 'http://mobycentral.icapture.ubc.ca/cgi-bin/MOBY05/mobycentral.pl',
+                                 URI => 'http://mobycentral.icapture.ubc.ca/MOBY/Central'}
+                             }); 
 
 	# a simple MOBY_Central call to get service types
 	my $DEFS;

===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/Registration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/Registration.java	2005/06/02 15:48:01	1.3
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/ui/graphical/applets/objectCreationTool/Registration.java	2005/07/19 15:36:24	1.4
@@ -17,8 +17,8 @@
  */
 public class Registration extends MobyDataType{
 
-	static final String ENDPOINT = "http://mobycentral.cbr.nrc.ca:8080/cgi-bin/MOBY05/mobycentral.pl";
-	static final String NAMESPACE = "http://mobycentral.cbr.nrc.ca:8080/MOBY/Central";
+	static final String ENDPOINT = "http://mobycentral.icapture.ubc.ca/cgi-bin/MOBY05/mobycentral.pl";
+	static final String NAMESPACE = "http://mobycentral.icapture.ubc.ca/MOBY/Central";
 
 	private static boolean PROTO = false;
 	/**