diff options
Diffstat (limited to 'java/src')
15 files changed, 122 insertions, 6 deletions
diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java index 61dc6be6d5d..621494cc8e3 100755 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/Application/AdapterEditor.java @@ -367,6 +367,13 @@ class AdapterEditor extends CommunicatorChildEditor }
}
+ protected boolean validate()
+ {
+ return check(new String[]{
+ "Adapter Name", _name.getText().trim(),
+ "Endpoints", _endpoints.getText().trim()});
+ }
+
void show(Adapter adapter)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java index 3096bc29783..98252d32962 100755 --- a/java/src/IceGridGUI/Application/ApplicationEditor.java +++ b/java/src/IceGridGUI/Application/ApplicationEditor.java @@ -185,6 +185,11 @@ class ApplicationEditor extends Editor descriptor.distrib.directories = _distribDirs.getList();
}
+ protected boolean validate()
+ {
+ return check(new String[]{"Name", _name.getText().trim()});
+ }
+
void show(Root root)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java index 6f6f69b882b..4261c4daa0a 100755 --- a/java/src/IceGridGUI/Application/DbEnvEditor.java +++ b/java/src/IceGridGUI/Application/DbEnvEditor.java @@ -112,6 +112,11 @@ class DbEnvEditor extends CommunicatorChildEditor _propertiesPanel.setName("Database Environment Properties");
}
+ protected boolean validate()
+ {
+ return check(new String[]{"Name", _name.getText().trim()});
+ }
+
void show(DbEnv dbEnv)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/Application/Editor.java index c29894ee28b..abd137b2669 100755 --- a/java/src/IceGridGUI/Application/Editor.java +++ b/java/src/IceGridGUI/Application/Editor.java @@ -16,6 +16,7 @@ import javax.swing.Action; import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JToolBar;
@@ -60,7 +61,7 @@ public class Editor extends EditorBase {
if(_applyButton.isEnabled())
{
- return applyUpdate();
+ return validate() && applyUpdate();
}
else
{
@@ -68,6 +69,11 @@ public class Editor extends EditorBase }
}
+ protected boolean validate()
+ {
+ return true;
+ }
+
protected boolean applyUpdate()
{
assert false;
@@ -114,7 +120,10 @@ public class Editor extends EditorBase {
public void actionPerformed(ActionEvent e)
{
- applyUpdate();
+ if(validate())
+ {
+ applyUpdate();
+ }
}
};
_applyButton = new JButton(apply);
@@ -184,8 +193,44 @@ public class Editor extends EditorBase {
return _updateListener;
}
-
-
+
+ //
+ // Check that these 'val' are filled in
+ //
+ boolean check(String[] nameValArray)
+ {
+ String emptyFields = "";
+ int errorCount = 0;
+
+ for(int i = 1; i < nameValArray.length; i += 2)
+ {
+ if(nameValArray[i] == null || nameValArray[i].length() == 0)
+ {
+ errorCount++;
+ if(emptyFields.length() > 0)
+ {
+ emptyFields += "\n";
+ }
+ emptyFields += "'" + nameValArray[i - 1] + "'";
+ }
+ }
+
+ if(errorCount > 0)
+ {
+ String message = errorCount == 1 ?
+ emptyFields + " cannot be empty" :
+ "The following fields cannot be empty:\n" + emptyFields;
+
+ JOptionPane.showMessageDialog(
+ _target.getCoordinator().getMainFrame(),
+ message,
+ "Validation failed",
+ JOptionPane.ERROR_MESSAGE);
+ }
+
+ return errorCount == 0;
+ }
+
protected JButton _applyButton;
protected JButton _discardButton;
protected DocumentListener _updateListener;
diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java index b85812f439a..d8f2cbb96a7 100755 --- a/java/src/IceGridGUI/Application/NodeEditor.java +++ b/java/src/IceGridGUI/Application/NodeEditor.java @@ -220,6 +220,11 @@ class NodeEditor extends Editor descriptor.loadFactor = _loadFactor.getText().trim();
}
+ protected boolean validate()
+ {
+ return check(new String[]{"Name", _name.getText().trim()});
+ }
+
void show(Node node)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/PlainServerEditor.java b/java/src/IceGridGUI/Application/PlainServerEditor.java index ec855ae1cfc..ed0189301eb 100755 --- a/java/src/IceGridGUI/Application/PlainServerEditor.java +++ b/java/src/IceGridGUI/Application/PlainServerEditor.java @@ -55,6 +55,11 @@ class PlainServerEditor extends AbstractServerEditor return _target.getDescriptor();
}
+ protected boolean validate()
+ {
+ return _subEditor.validate();
+ }
+
void show(PlainServer server)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/PlainServiceEditor.java b/java/src/IceGridGUI/Application/PlainServiceEditor.java index 5d0884a4e16..b797461d6c9 100755 --- a/java/src/IceGridGUI/Application/PlainServiceEditor.java +++ b/java/src/IceGridGUI/Application/PlainServiceEditor.java @@ -47,6 +47,11 @@ class PlainServiceEditor extends CommunicatorChildEditor _propertiesPanel.setName("Service Properties");
}
+ protected boolean validate()
+ {
+ return _subEditor.validate();
+ }
+
void writeDescriptor()
{
diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/Application/PropertySetEditor.java index f5ef104cffe..63b6fdb0dfd 100755 --- a/java/src/IceGridGUI/Application/PropertySetEditor.java +++ b/java/src/IceGridGUI/Application/PropertySetEditor.java @@ -176,6 +176,11 @@ class PropertySetEditor extends Editor _propertiesPanel.setName("Named Property Set");
}
+ protected boolean validate()
+ {
+ return check(new String[]{"ID", _id.getText()});
+ }
+
void show(PropertySet nps)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java index e749f653def..02c14f027bd 100755 --- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java @@ -262,7 +262,7 @@ class ReplicaGroupEditor extends Editor protected void appendProperties(DefaultFormBuilder builder)
{
- builder.append("Replica Group ID" );
+ builder.append("Replica Group ID");
builder.append(_id, 3);
builder.nextLine();
@@ -308,6 +308,12 @@ class ReplicaGroupEditor extends Editor _propertiesPanel.setName("Replica Group Properties");
}
+ protected boolean validate()
+ {
+ return check(new String[]{"Replica Group ID", _id.getText().trim()});
+ }
+
+
void show(ReplicaGroup replicaGroup)
{
//
diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index d7269156e35..2be5ec9c1d3 100755 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -245,6 +245,13 @@ class ServerSubEditor extends CommunicatorSubEditor return getServerDescriptor().id.equals(_id.getText().trim());
}
+ boolean validate()
+ {
+ return _mainEditor.check(new String[]{
+ "Server ID", _id.getText().trim(),
+ "Path to Executable", _exe.getText().trim()});
+ }
+
void show(boolean isEditable)
{
ServerDescriptor descriptor = getServerDescriptor();
diff --git a/java/src/IceGridGUI/Application/ServerTemplateEditor.java b/java/src/IceGridGUI/Application/ServerTemplateEditor.java index bfad59a82f4..d74211b7f28 100755 --- a/java/src/IceGridGUI/Application/ServerTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServerTemplateEditor.java @@ -42,6 +42,11 @@ class ServerTemplateEditor extends TemplateEditor _propertiesPanel.setName("Server Template Properties");
}
+ protected boolean validate()
+ {
+ return super.validate() && _subEditor.validate();
+ }
+
void show(ServerTemplate t)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java index 59113937479..5d03bdadffa 100755 --- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java +++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java @@ -152,7 +152,6 @@ class ServiceInstanceEditor extends CommunicatorChildEditor _propertiesPanel.setName("Service Properties");
}
-
void show(ServiceInstance service)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/ServiceSubEditor.java b/java/src/IceGridGUI/Application/ServiceSubEditor.java index 1a9779e7ba6..d1a5d249f07 100755 --- a/java/src/IceGridGUI/Application/ServiceSubEditor.java +++ b/java/src/IceGridGUI/Application/ServiceSubEditor.java @@ -74,6 +74,13 @@ class ServiceSubEditor extends CommunicatorSubEditor return getServiceDescriptor().name.equals(_name.getText().trim());
}
+ boolean validate()
+ {
+ return _mainEditor.check(new String[]{
+ "Service Name", _name.getText().trim(),
+ "Entry Point", _entry.getText().trim()});
+ }
+
void show(boolean isEditable)
{
ServiceDescriptor descriptor = getServiceDescriptor();
diff --git a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java index e5d72f4d41b..5f1eab836db 100755 --- a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java @@ -42,6 +42,11 @@ class ServiceTemplateEditor extends TemplateEditor _propertiesPanel.setName("Service Template Properties");
}
+ protected boolean validate()
+ {
+ return super.validate() && _subEditor.validate();
+ }
+
void show(ServiceTemplate t)
{
detectUpdates(false);
diff --git a/java/src/IceGridGUI/Application/TemplateEditor.java b/java/src/IceGridGUI/Application/TemplateEditor.java index 2131e6b2cf1..d06f37f0ac6 100755 --- a/java/src/IceGridGUI/Application/TemplateEditor.java +++ b/java/src/IceGridGUI/Application/TemplateEditor.java @@ -84,6 +84,11 @@ class TemplateEditor extends Editor builder.nextLine();
}
+ protected boolean validate()
+ {
+ return check(new String[]{"Template ID", _template.getText().trim()});
+ }
+
void show()
{
TemplateDescriptor descriptor = getDescriptor();
|