You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2012/10/19 19:06:33 UTC
svn commit: r1400170 - in
/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
registrybrowser/nodes/ ui/dialogs/descriptors/ ui/menues/
Author: chathuri
Date: Fri Oct 19 17:06:32 2012
New Revision: 1400170
URL: http://svn.apache.org/viewvc?rev=1400170&view=rev
Log:
fixing parent form not set for add application dialog and add host dialog
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionNode.java Fri Oct 19 17:06:32 2012
@@ -86,7 +86,7 @@ public class HostDescriptionNode extends
}
private boolean editHostDescription(JTree tree) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(),false,getHostDescription());
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(),false,getHostDescription(), null);
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/HostDescriptionsNode.java Fri Oct 19 17:06:32 2012
@@ -84,7 +84,7 @@ public class HostDescriptionsNode extend
deleteHostDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry());
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getXBayaEngine().getConfiguration().getJcrComponentRegistry().getRegistry(), null);
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
refresh();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java Fri Oct 19 17:06:32 2012
@@ -93,7 +93,7 @@ public class ServiceDescriptionNode exte
}
private boolean editServiceDescription(JTree tree) {
- DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,getServiceDescription());
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,getServiceDescription(), null);
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry(),false,getServiceDescription());
// serviceDescriptionDialog.open();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java Fri Oct 19 17:06:32 2012
@@ -84,7 +84,7 @@ public class ServiceDescriptionsNode ext
deleteServiceDescription(tree);
return true;
} else if (action.equals(AddAction.ID)) {
- DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry());
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(null, getRegistry());
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
// serviceDescriptionDialog.open();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/ApplicationDescriptionDialog.java Fri Oct 19 17:06:32 2012
@@ -354,7 +354,7 @@ public class ApplicationDescriptionDialo
lnkNewHost.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(), null);
hostDescriptionDialog.setLocationRelativeTo(getContentPane());
hostDescriptionDialog.open();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DeploymentDescriptionDialog.java Fri Oct 19 17:06:32 2012
@@ -21,12 +21,7 @@
package org.apache.airavata.xbaya.ui.dialogs.descriptors;
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter;
@@ -41,19 +36,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultCellEditor;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.ListSelectionModel;
-import javax.swing.WindowConstants;
+import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TableModelEvent;
@@ -111,7 +94,7 @@ public class DeploymentDescriptionDialog
*/
public static void main(String[] args) {
try {
- DeploymentDescriptionDialog dialog = new DeploymentDescriptionDialog(null,true,null);
+ DeploymentDescriptionDialog dialog = new DeploymentDescriptionDialog(null,true,null,null);
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
dialog.setVisible(true);
} catch (Exception e) {
@@ -119,17 +102,23 @@ public class DeploymentDescriptionDialog
}
}
- public DeploymentDescriptionDialog(AiravataRegistry2 registry) {
- this(registry,true,null);
+ public DeploymentDescriptionDialog(JFrame parent, AiravataRegistry2 registry) {
+ this(registry, true, null, parent);
}
-
+
+// public DeploymentDescriptionDialog(Frame parent) {
+// super(parent);
+// }
+
/**
* Create the dialog.
*/
- public DeploymentDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription) {
- setNewDescription(newDescription);
+ public DeploymentDescriptionDialog(AiravataRegistry2 registry, boolean newDescription, ServiceDescription serviceDescription, JFrame parent) {
+ super(parent);
+ setNewDescription(newDescription);
this.setOrginalServiceDescription(serviceDescription);
setSuggestedNamePrefix(suggestedNamePrefix);
+
if (isNewDescription()) {
setTitlePrefix("Register Application");
}else{
@@ -161,6 +150,10 @@ public class DeploymentDescriptionDialog
}
public void open() {
+// pack();
+// setAlwaysOnTop(true);
+ setLocationRelativeTo(getOwner());
+ setModal(true);
setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
setVisible(true);
}
@@ -270,7 +263,6 @@ public class DeploymentDescriptionDialog
cancelButton.setActionCommand("Cancel");
}
}
-
contentPanel.add(lblServiceName);
contentPanel.add(txtApplicationServiceName);
GridPanel pnlTables=new GridPanel();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/DescriptorEditorDialog.java Fri Oct 19 17:06:32 2012
@@ -214,7 +214,7 @@ public class DescriptorEditorDialog exte
switch (descriptorType){
case HOST:
HostDescription h = (HostDescription) getSelected();
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(),false,h);
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(),false,h, null);
hostDescriptionDialog.setLocationRelativeTo(this.engine.getGUI().getFrame());
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()) {
@@ -223,7 +223,7 @@ public class DescriptorEditorDialog exte
break;
case SERVICE:
ServiceDescription d = (ServiceDescription) getSelected();
- DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,d);
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,d, null);
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry(),false,d);
// serviceDescriptionDialog.open();
@@ -247,14 +247,14 @@ public class DescriptorEditorDialog exte
private void newDescriptor() throws MalformedDescriptorException, RegistryException {
switch (descriptorType){
case HOST:
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry(), null);
hostDescriptionDialog.open();
if (hostDescriptionDialog.isHostCreated()){
loadDescriptors();
}
break;
case SERVICE:
- DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry());
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(null, getRegistry());
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
// serviceDescriptionDialog.open();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDeploymentDialog.java Fri Oct 19 17:06:32 2012
@@ -245,7 +245,7 @@ public class HostDeploymentDialog extend
lnkNewHost.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
- HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry());
+ HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(getRegistry(), null);
hostDescriptionDialog.setLocationRelativeTo(getContentPane());
hostDescriptionDialog.open();
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/descriptors/HostDescriptionDialog.java Fri Oct 19 17:06:32 2012
@@ -30,12 +30,7 @@ import java.awt.event.KeyEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
import org.apache.airavata.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.SwingUtil;
@@ -93,8 +88,8 @@ public class HostDescriptionDialog exten
private static final String REMOTE_PROTOCOL_STR_HADOOP="Hadoop";
- public HostDescriptionDialog(AiravataRegistry2 registry) {
- this(registry,true,null);
+ public HostDescriptionDialog(AiravataRegistry2 registry, JFrame parent) {
+ this(registry,true,null, parent);
}
/**
@@ -103,7 +98,8 @@ public class HostDescriptionDialog exten
* @param newHost
* @param originalHostDescription
*/
- public HostDescriptionDialog(AiravataRegistry2 registry, boolean newHost, HostDescription originalHostDescription) {
+ public HostDescriptionDialog(AiravataRegistry2 registry, boolean newHost, HostDescription originalHostDescription, JFrame parent) {
+ super(parent);
setNewHost(newHost);
setOriginalHostDescription(originalHostDescription);
addWindowListener(new WindowAdapter() {
@@ -132,6 +128,8 @@ public class HostDescriptionDialog exten
* Displays the dialog.
*/
public void open() {
+ setModal(true);
+ setLocationRelativeTo(getOwner());
setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
setVisible(true);
}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java?rev=1400170&r1=1400169&r2=1400170&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenuItem.java Fri Oct 19 17:06:32 2012
@@ -311,7 +311,8 @@ public class XBayaMenuItem implements XB
public void actionPerformed(ActionEvent e) {
if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
- DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(XBayaMenuItem.this.engine.getGUI().getFrame(), engine.getConfiguration().getJcrComponentRegistry()
+ .getRegistry());
serviceDescriptionDialog.open();
// ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(
// engine.getConfiguration().getJcrComponentRegistry()
@@ -358,7 +359,7 @@ public class XBayaMenuItem implements XB
if (XBayaUtil.acquireJCRRegistry(engine)) {
try {
HostDescriptionDialog hostDescriptionDialog = new HostDescriptionDialog(
- engine.getConfiguration().getJcrComponentRegistry().getRegistry());
+ engine.getConfiguration().getJcrComponentRegistry().getRegistry(),XBayaMenuItem.this.engine.getGUI().getFrame() );
hostDescriptionDialog.open();
} catch (Exception e1) {
engine.getGUI().getErrorWindow().error(e1);