airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1355420 - in /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui: dialogs/descriptors/ menues/
Date Fri, 29 Jun 2012 14:47:20 GMT
Author: samindaw
Date: Fri Jun 29 14:47:19 2012
New Revision: 1355420

URL: http://svn.apache.org/viewvc?rev=1355420&view=rev
Log:
updating UI labels etc.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1355420&r1=1355419&r2=1355420&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
Fri Jun 29 14:47:19 2012
@@ -326,9 +326,9 @@ public class ApplicationDescriptionDialo
             setupLayoutForBrowse(tmpDirPath, component);
 
 
-            JLabel lblTemporaryDirectory = new JLabel("Temporary directory");
+            JLabel lblTemporaryDirectory = new JLabel("Scratch working directory");
 
-            JButton btnAdvance = new JButton("Advanced options...");
+            JButton btnAdvance = new JButton("Advanced application configurations...");
             btnAdvance.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     try {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1355420&r1=1355419&r2=1355420&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
Fri Jun 29 14:47:19 2012
@@ -184,9 +184,9 @@ public class HostDescriptionDialog exten
     	setModal(true);
         setLocationRelativeTo(null);
         if (isNewHost()) {
-			setTitle("New Host Description");
+			setTitle("Register Host");
 		}else{
-			setTitle("Update Host Description: "+getOriginalHostDescription().getType().getHostName());
+			setTitle("Update Host: "+getOriginalHostDescription().getType().getHostName());
 		}
 		this.hostIdTextField = new XBayaTextField();
         this.hostAddressTextField = new XBayaTextField();
@@ -285,7 +285,7 @@ public class HostDescriptionDialog exten
 		GridPanel globusPanel = new GridPanel();
         this.GridFTPTextField = new XBayaTextField();
         this.globusGateKeeperTextField = new XBayaTextField();
-        globusGateKeeperLabel = new XBayaLabel("Globus Gate Keeper Endpoint", this.globusGateKeeperTextField);
       
+        globusGateKeeperLabel = new XBayaLabel("GRAM Endpoint", this.globusGateKeeperTextField);
       
         gridFTPLabel = new XBayaLabel("Grid FTP Endpoint", this.GridFTPTextField);
         globusPanel.add(globusGateKeeperLabel);
         globusPanel.add(globusGateKeeperTextField);
@@ -423,12 +423,12 @@ public class HostDescriptionDialog exten
 			infoPanel2.getContentPanel().removeAll();
 			if (selectedProtocol.equals(REMOTE_PROTOCOL_STR_LOCAL)){
 				getHostDescription().getType().changeType(HostDescriptionType.type);
-				infoPanel2.add(createPanelWithMessage("No configurations for remote protocol '"+REMOTE_PROTOCOL_STR_LOCAL+"'"));
+				infoPanel2.add(createPanelWithMessage("No configurations needed."));
 			}else if (selectedProtocol.equals(REMOTE_PROTOCOL_STR_GLOBUS)){
 				getHostDescription().getType().changeType(GlobusHostType.type);
 				infoPanel2.add(createGlobusRemoteProtocolPanel());
 			}else{
-				infoPanel2.add(createPanelWithMessage("Remote protocol '"+selectedProtocol+"' is not
supported yet."));
+				infoPanel2.add(createPanelWithMessage("Not supported."));
 			}
 			infoPanel2.getContentPanel().setBorder(BorderFactory.createEtchedBorder());
 			infoPanel2.getContentPanel().updateUI();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java?rev=1355420&r1=1355419&r2=1355420&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ServiceDescriptionDialog.java
Fri Jun 29 14:47:19 2012
@@ -136,7 +136,7 @@ public class ServiceDescriptionDialog ex
         addWindowListener(new WindowAdapter() {
             @Override
             public void windowOpened(WindowEvent arg0) {
-                if (isNewDescription()) {
+                if (isNewDescription() && !isServiceDescriptionMode()) {
 					String baseName = isServiceDescriptionMode()? "Service":getSuggestedNamePrefix()+"_Service";
 					int i;
 					String defaultName;
@@ -304,7 +304,7 @@ public class ServiceDescriptionDialog ex
 			lblTableParameterNote = new JLabel("*Note: Right click on the table to bind an existing
service");
 			lblTableParameterNote.setFont(new Font("Tahoma", Font.ITALIC, 11));
 		}
-		chkForceFileStagingToWorkDir=new JCheckBox("Save URI content in work directory");
+		chkForceFileStagingToWorkDir=new JCheckBox("Advanced: Force input file staging to working
directory");
         chkForceFileStagingToWorkDir.addActionListener(new ActionListener(){
 
 			@Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1355420&r1=1355419&r2=1355420&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
Fri Jun 29 14:47:19 2012
@@ -323,7 +323,7 @@ public class XBayaMenuItem implements XB
     }
 
     private void createRegisterApplicationDesc() {
-        this.registerApplicationDesc = new JMenuItem("Add application...");
+        this.registerApplicationDesc = new JMenuItem("Register Application...");
 
         this.registerApplicationDesc.addActionListener(new AbstractAction() {
 			private static final long serialVersionUID = 1L;
@@ -365,7 +365,7 @@ public class XBayaMenuItem implements XB
 
     }
     private JMenuItem createClearWorkflowItem() {
-        JMenuItem menuItem = new JMenuItem("Clear workflow");
+        JMenuItem menuItem = new JMenuItem("Clear Workflow");
         menuItem.addActionListener(new AbstractAction() {
 			private static final long serialVersionUID = 1L;
 			public void actionPerformed(ActionEvent e) {
@@ -377,7 +377,7 @@ public class XBayaMenuItem implements XB
 
     private JMenuItem createNewWorkflowTabMenuItem() {
         
-		JMenuItem menuItem = new JMenuItem("New workflow", MenuIcons.NEW_ICON);
+		JMenuItem menuItem = new JMenuItem("New Workflow", MenuIcons.NEW_ICON);
         menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, ActionEvent.CTRL_MASK));
         AbstractAction action = new AbstractAction() {
 			private static final long serialVersionUID = 1L;
@@ -404,7 +404,7 @@ public class XBayaMenuItem implements XB
     }
 
     private JMenuItem createCloseAllWorkflowTabItem() {
-        JMenuItem menuItem = new JMenuItem("Close all");
+        JMenuItem menuItem = new JMenuItem("Close All");
         menuItem.addActionListener(new AbstractAction() {
 			private static final long serialVersionUID = 1L;
             public void actionPerformed(ActionEvent e) {
@@ -431,7 +431,7 @@ public class XBayaMenuItem implements XB
     }
     
     private void createOpenWorkflowMenuItem() {
-		this.openWorkflowItem = new JMenuItem("Open...", MenuIcons.OPEN_ICON);
+		this.openWorkflowItem = new JMenuItem("Open Workflow...", MenuIcons.OPEN_ICON);
         this.openWorkflowItem.setMnemonic(KeyEvent.VK_O);
         openWorkflowItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_O, ActionEvent.CTRL_MASK));
         AbstractAction action = new AbstractAction() {



Mime
View raw message