summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2005-08-11 11:32:12 +0000
committerBernard Normier <bernard@zeroc.com>2005-08-11 11:32:12 +0000
commit25b91f2b5faa633adc293c4894ffb65f57bb0e9f (patch)
treee0c69c480d764d38ab10db10757ebc03d77ba89c /java/src
parentMissing file (diff)
downloadice-25b91f2b5faa633adc293c4894ffb65f57bb0e9f.tar.bz2
ice-25b91f2b5faa633adc293c4894ffb65f57bb0e9f.tar.xz
ice-25b91f2b5faa633adc293c4894ffb65f57bb0e9f.zip
Fixes
Diffstat (limited to 'java/src')
-rwxr-xr-xjava/src/IceGrid/AdminGUI.java2
-rwxr-xr-xjava/src/IceGrid/MainPane.java6
-rwxr-xr-xjava/src/IceGrid/Model.java10
3 files changed, 9 insertions, 9 deletions
diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java
index 32effdba2e6..6cd9dd845d8 100755
--- a/java/src/IceGrid/AdminGUI.java
+++ b/java/src/IceGrid/AdminGUI.java
@@ -312,7 +312,7 @@ public class AdminGUI extends JFrame
{
public void actionPerformed(ActionEvent e)
{
- _model.toggleSubstituteVariables();
+ _model.toggleSubstitute();
}
};
diff --git a/java/src/IceGrid/MainPane.java b/java/src/IceGrid/MainPane.java
index 781a2d24db6..278b062387b 100755
--- a/java/src/IceGrid/MainPane.java
+++ b/java/src/IceGrid/MainPane.java
@@ -134,11 +134,11 @@ public class MainPane extends JSplitPane
JScrollPane appScroll =
new JScrollPane(tree,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- appScroll.setBorder(Borders.DIALOG_BORDER);
+ JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ appScroll.setBorder(Borders.EMPTY_BORDER);
SimpleInternalFrame leftPane = new SimpleInternalFrame("Applications");
- leftPane.setContent(tree);
+ leftPane.setContent(appScroll);
leftPane.setPreferredSize(new Dimension(280, 350));
//
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java
index aee5cc6fffd..3d65c14348d 100755
--- a/java/src/IceGrid/Model.java
+++ b/java/src/IceGrid/Model.java
@@ -315,17 +315,17 @@ public class Model
return true;
}
- void toggleSubstituteVariables()
+ void toggleSubstitute()
{
- _substituteVariables = !_substituteVariables;
+ _substitute = !_substitute;
//
// TODO: need to send a notification to redisplay current properties
//
}
- public boolean substituteVariables()
+ public boolean substitute()
{
- return _substituteVariables;
+ return _substitute;
}
public AdminPrx getAdmin()
@@ -385,7 +385,7 @@ public class Model
private JTree _tree;
- private boolean _substituteVariables = false;
+ private boolean _substitute = false;
private SimpleInternalFrame _propertiesFrame;
}