[MOBY-guts] biomoby commit

Eddie Kawas kawas at pub.open-bio.org
Sat Dec 18 18:51:27 UTC 2004


kawas
Sat Dec 18 13:51:27 EST 2004
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool
In directory pub.open-bio.org:/tmp/cvs-serv30254/org/biomoby/client/gui/serviceInstanceCreationTool

Modified Files:
	ServiceInstancePanelFactory.java 
Log Message:
fixed the edit details page so that it is more consistent with the applet. Other small revisions made.

moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool ServiceInstancePanelFactory.java,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceInstancePanelFactory.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/gui/serviceInstanceCreationTool/ServiceInstancePanelFactory.java	2004/11/17 17:15:26	1.2
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/client/gui/serviceInstanceCreationTool/ServiceInstancePanelFactory.java	2004/12/18 18:51:27	1.3
@@ -629,7 +629,6 @@
 		//		ButtonBeautifier.enhanceButton(done, 11, tool.getClass());
 
 		JButton add = new JButton(" Add Data Type To The Collection ");
-		//TODO press this and ask to choose another object or to add the
 		// collection to the service
 		add.setActionCommand("addDataType");
 		add.setName("addDataType"); // adds the data type
@@ -1059,7 +1058,6 @@
 						+ "of allowable values."
 						+ "Once you have inputted all of the appropriate details, click on the button<p>"
 						+ "labelled 'Add to Service' to add the secondary input to your service.</b></font></html>");
-		//TODO
 		String[] theLabels = {
 				"<html><b>Secondary Input Name <i> REQUIRED </i> :</b></html>",
 				// required
@@ -1101,7 +1099,7 @@
 		// goes back to the input/output radio panel
 		done.addActionListener(ioal);
 
-		JButton cancel = new JButton("  Cancel  "); //TODO
+		JButton cancel = new JButton("  Cancel  "); 
 		ButtonBeautifier.enhanceButton(cancel, 6, tool.getClass());
 		cancel.setActionCommand("back");
 		cancel.setName("back"); // goes back to the input/output radio panel
@@ -1244,22 +1242,63 @@
 		JLabel signatureUrlLabel = new JLabel(
 				"<html><font size=3><b><i>Signature URL (Optional)</i></b></font></html>");
 
-		JLabel serviceNameLabel2 = new JLabel(
-				"<html><font size=3><b><i>  Must be in valid XML format</i></b></font></html>");
-		JLabel authorityLabel2 = new JLabel(
-				"<html><font size=3><b><i>  Must be a valid URI - e.g. www.biomoby.org</i></b></font></html>");
-		JLabel emailLabel2 = new JLabel(
-				"<html><font size=3><b><i>  Must be a valid email address</i></b></font></html>");
-		JLabel descriptionLabel2 = new JLabel(
-				"<html><font size=3><b><i></i></b></font></html>");
-		JLabel authoritativeLabel2 = new JLabel(
-				"<html><font size=3><b><i></i></b></font></html>");
-		JLabel typeLabel2 = new JLabel(
-				"<html><font size=3><b><i></i></b></font></html>");
-		JLabel urlLabel2 = new JLabel(
-				"<html><font size=3><b><i>  Must be a valid URL - e.g. http://some.domain/something</i></b></font></html>");
-		JLabel signatureUrlLabel2 = new JLabel(
-				"<html><font size=3><b><i>  Must be a valid URL - e.g. http://some.domain/something</i></b></font></html>");
+		JButton serviceNameLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(serviceNameLabel2, 14, tool.getClass());
+		serviceNameLabel2
+				.setToolTipText("<html><font size=3><b><i>  Name cannot contain spaces nor start with special characters </i></b></font></html>");
+		serviceNameLabel2.setActionCommand("1");
+		serviceNameLabel2.addActionListener(hal);
+
+		JButton authorityLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(authorityLabel2, 14, tool.getClass());
+		authorityLabel2
+				.setToolTipText("<html><font size=3><b><i>  Must be a valid URI </i></b></font></html>");
+		authorityLabel2.setActionCommand("2");
+		authorityLabel2.addActionListener(hal);
+
+		JButton emailLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(emailLabel2, 14, tool.getClass());
+		emailLabel2
+				.setToolTipText("<html><font size=3><b><i>  Must be a valid email address </i></b></font></html>");
+		emailLabel2.setActionCommand("3");
+		emailLabel2.addActionListener(hal);
+
+		JButton descriptionLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(descriptionLabel2, 14, tool.getClass());
+		descriptionLabel2
+				.setToolTipText("<html><font size=3><b><i>Please provide a comprehensive description </i></b></font></html>");
+		descriptionLabel2.setActionCommand("4");
+		descriptionLabel2.addActionListener(hal);
+			
+		JButton authoritativeLabel2 = new JButton("");
+		ButtonBeautifier
+				.enhanceButton(authoritativeLabel2, 14, tool.getClass());
+		authoritativeLabel2
+				.setToolTipText("<html><font size=3><b><i>Is your service authoritative?</i></b></font></html>");
+		authoritativeLabel2.setActionCommand("5");
+		authoritativeLabel2.addActionListener(hal);
+
+		JButton typeLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(typeLabel2, 14, tool.getClass());
+		typeLabel2
+				.setToolTipText("<html><font size=3><b><i>What type of service instance are you creating?</i></b></font></html>");
+		typeLabel2.setActionCommand("6");
+		typeLabel2.addActionListener(hal);
+		
+		JButton urlLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(urlLabel2, 14, tool.getClass());
+		urlLabel2
+				.setToolTipText("<html><font size=3><b><i>  Must be a valid URL </i></b></font></html>");
+		urlLabel2.setActionCommand("7");
+		urlLabel2.addActionListener(hal);
+		
+		JButton signatureUrlLabel2 = new JButton("");
+		ButtonBeautifier.enhanceButton(signatureUrlLabel2, 14, tool.getClass());
+		signatureUrlLabel2
+				.setToolTipText("<html><font size=3><b><i>  Must be a valid URL  </i></b></font></html>");
+		signatureUrlLabel2.setActionCommand("8");
+		signatureUrlLabel2.addActionListener(hal);
+
 
 		// check if we need to fill in the service fields
 		Service s = tool.getService();
@@ -1316,33 +1355,67 @@
 			else
 				authoritativeComboBox.setSelectedIndex(1);
 
-		// add the items to a panel with 2 columns
+//		 add the items to a panel with 2 columns
 		JPanel itemPanel = null;
 		itemPanel = initPanel(itemPanel, "itemPanel", 3);
 		itemPanel.add(serviceNameLabel);
 		itemPanel.add(serviceNameField);
-		itemPanel.add(serviceNameLabel2);
+		// the help1 panels ensure that the button is fitted
+		JPanel help1 = null;
+		help1 = initPanel(help1, "", -1);
+		help1.add(serviceNameLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help1);
+
+
 		itemPanel.add(descriptionLabel);
 		itemPanel.add(descriptionField);
-		itemPanel.add(descriptionLabel2);
+		JPanel help2 = null;
+		help2 = initPanel(help1, "", -1);
+		help2.add(descriptionLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help2);
+
 		itemPanel.add(emailLabel);
 		itemPanel.add(emailField);
-		itemPanel.add(emailLabel2);
+		JPanel help3 = null;
+		help3 = initPanel(help3, "", -1);
+		help3.add(emailLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help3);
+
 		itemPanel.add(urlLabel);
 		itemPanel.add(urlField);
-		itemPanel.add(urlLabel2);
+		JPanel help4 = null;
+		help4 = initPanel(help1, "", -1);
+		help4.add(urlLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help4);
+
+
 		itemPanel.add(authoritativeLabel);
 		itemPanel.add(authoritativeComboBox);
-		itemPanel.add(authoritativeLabel2);
+		JPanel help5 = null;
+		help5 = initPanel(help1, "", -1);
+		help5.add(authoritativeLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help5);
+
 		itemPanel.add(typeLabel);
 		itemPanel.add(categoryComboBox);
-		itemPanel.add(typeLabel2);
+		JPanel help6 = null;
+		help6 = initPanel(help1, "", -1);
+		help6.add(typeLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help6);
+
 		itemPanel.add(authorityLabel);
 		itemPanel.add(authorityField);
-		itemPanel.add(authorityLabel2);
+		JPanel help7 = null;
+		help7 = initPanel(help1, "", -1);
+		help7.add(authorityLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help7);
+
 		itemPanel.add(signatureUrlLabel);
 		itemPanel.add(sigUrlField);
-		itemPanel.add(signatureUrlLabel2);
+		JPanel help8 = null;
+		help8 = initPanel(help1, "", -1);
+		help8.add(signatureUrlLabel2,BorderLayout.LINE_START);
+		itemPanel.add(help8);
 
 		JButton next = new JButton(" Go Back To (In/Out)put Selection ");
 		next.setActionCommand("backFromEdit");




More information about the MOBY-guts mailing list