summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/IceGrid/Model.java12
-rwxr-xr-xjava/src/IceGrid/TreeNode/DbEnvs.java2
-rwxr-xr-xjava/src/IceGrid/TreeNode/ListParent.java3
-rwxr-xr-xjava/src/IceGrid/TreeNode/TemplateEditor.java2
4 files changed, 2 insertions, 17 deletions
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java
index b7907446a7b..fa2121f771a 100755
--- a/java/src/IceGrid/Model.java
+++ b/java/src/IceGrid/Model.java
@@ -352,8 +352,6 @@ public class Model
{
assert(_latestSerial == -1);
_latestSerial = serial;
- System.err.println("Registry init: serial == " + _latestSerial);
-
_root.init(applications);
}
@@ -398,8 +396,6 @@ public class Model
boolean proceedWithUpdate(int serial)
{
- System.err.println("Proceed with update serial == " + serial);
-
if(_latestSerial == -1 || serial <= _latestSerial)
{
//
@@ -516,7 +512,6 @@ public class Model
{
_mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
_writeSerial = _sessionKeeper.getSession().startUpdate();
- System.err.println("New write serial == " + _writeSerial);
}
catch(AccessDeniedException e)
{
@@ -622,9 +617,6 @@ public class Model
private boolean saveUpdates()
{
- System.err.println("write serial == " + _writeSerial);
- System.err.println("latest serial == " + _latestSerial);
-
assert _writeSerial == _latestSerial;
_mainFrame.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@@ -1231,8 +1223,6 @@ public class Model
{
public void actionPerformed(ActionEvent e)
{
- System.err.println("Action fired");
-
helpContents();
}
};
@@ -1859,8 +1849,6 @@ public class Model
//
private void destroyCommunicator()
{
- System.err.println("Destroying communicator");
-
try
{
_communicator.destroy();
diff --git a/java/src/IceGrid/TreeNode/DbEnvs.java b/java/src/IceGrid/TreeNode/DbEnvs.java
index 82372088392..ea024893836 100755
--- a/java/src/IceGrid/TreeNode/DbEnvs.java
+++ b/java/src/IceGrid/TreeNode/DbEnvs.java
@@ -90,8 +90,6 @@ class DbEnvs extends ListParent
CommonBase addNewChild(Object d) throws UpdateFailedException
{
- System.err.println("Adding new child to " + _id);
-
DbEnvDescriptor descriptor = (DbEnvDescriptor)d;
try
diff --git a/java/src/IceGrid/TreeNode/ListParent.java b/java/src/IceGrid/TreeNode/ListParent.java
index 2053edc3e85..f71f425dddf 100755
--- a/java/src/IceGrid/TreeNode/ListParent.java
+++ b/java/src/IceGrid/TreeNode/ListParent.java
@@ -56,8 +56,7 @@ abstract class ListParent extends Parent
java.util.List newChildren = new java.util.LinkedList();
java.util.List list = _parent.findAllInstances(this);
- System.err.println("Parent == " + _parent.getId());
- System.err.println("Found " + list.size() + " instances");
+
java.util.Iterator p = list.iterator();
while(p.hasNext())
{
diff --git a/java/src/IceGrid/TreeNode/TemplateEditor.java b/java/src/IceGrid/TreeNode/TemplateEditor.java
index 2e11db1731c..659a9024ab0 100755
--- a/java/src/IceGrid/TreeNode/TemplateEditor.java
+++ b/java/src/IceGrid/TreeNode/TemplateEditor.java
@@ -57,7 +57,7 @@ class TemplateEditor extends Editor
}
};
openParametersDialog.putValue(Action.SHORT_DESCRIPTION,
- "Editor parameters");
+ "Edit parameters");
_parametersButton = new JButton(openParametersDialog);
}