diff -ruN a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -80,6 +80,10 @@ _objects.setObjects(descriptor.objects, resolver); _allocatables.setObjects(descriptor.allocatables, resolver); + + _descriptionCount = adapter.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DescriptionCount", _descriptionCount); + _wellKnownObjectCount = adapter.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.WellKnownObjectCount", _wellKnownObjectCount); + _allocatableObjectCount = adapter.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.AllocatableObjectCount", _allocatableObjectCount); } protected void appendProperties(DefaultFormBuilder builder) @@ -97,13 +101,15 @@ builder.appendSeparator("Configuration"); builder.append("Description"); - builder.nextLine(); - builder.append(""); - builder.nextRow(-2); + for(int x=0; x<_descriptionCount; ++x) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_descriptionCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_description); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 3)); - builder.nextRow(2); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _descriptionCount*2+1)); + builder.nextRow(_descriptionCount*2); builder.nextLine(); builder.append("Adapter ID"); @@ -132,29 +138,25 @@ builder.nextLine(); builder.append("Well-known Objects"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-6); + for(int x=0; x<_wellKnownObjectCount; ++x) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_wellKnownObjectCount*-2); scrollPane = new JScrollPane(_objects); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _wellKnownObjectCount*2+1)); + builder.nextRow(_wellKnownObjectCount*2); builder.nextLine(); builder.append("Allocatable Objects"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-6); + for(int x=0; x<_allocatableObjectCount; ++x) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_allocatableObjectCount*-2); scrollPane = new JScrollPane(_allocatables); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _allocatableObjectCount*2+1)); + builder.nextRow(_allocatableObjectCount*2); builder.nextLine(); } @@ -179,4 +181,7 @@ private TableField _objects = new TableField("Identity", "Type"); private TableField _allocatables = new TableField("Identity", "Type"); + private int _descriptionCount = 1; + private int _wellKnownObjectCount = 3; + private int _allocatableObjectCount = 3; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java --- a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -36,32 +36,42 @@ protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); - builder.nextLine(); - builder.append(""); - builder.nextRow(-2); + for(int x=0; x<_descriptionCount; ++x) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_descriptionCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_description); - builder.add(scrollPane, - cc.xywh(builder.getColumn(), builder.getRow(), 3, 3)); - builder.nextRow(2); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _descriptionCount*2+1)); + builder.nextRow(_descriptionCount*2); builder.nextLine(); builder.append("Properties"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); + for(int x=0; x<_propertyCount; ++x) { + builder.nextLine(); + builder.append(""); + } - builder.nextLine(); - builder.append(""); - - builder.nextRow(-6); + builder.nextRow(_propertyCount*-2); scrollPane = new JScrollPane(_properties); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _propertyCount*2+1)); + builder.nextRow(_propertyCount*2); builder.nextLine(); } + protected void setPropertyCount(int propertyCount) + { + _propertyCount = propertyCount; + } + + protected void setDescriptionCount(int descriptionCount) + { + _descriptionCount = descriptionCount; + } + private JTextArea _description = new JTextArea(3, 20); private TableField _properties = new TableField("Name", "Value"); + private int _descriptionCount = 1; + private int _propertyCount = 3; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java --- a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -48,18 +48,22 @@ } _properties.setProperties(descriptor.properties, resolver); + _descriptionCount = dbEnv.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DescriptionCount", _descriptionCount); + _propertyCount = dbEnv.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.PropertyCount", _propertyCount); } protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); - builder.nextLine(); - builder.append(""); - builder.nextRow(-2); + for(int x=0; x<_descriptionCount; ++x) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_descriptionCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_description); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 3)); - builder.nextRow(2); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _descriptionCount*2+1)); + builder.nextRow(_descriptionCount*2); builder.nextLine(); builder.append("DB Home" ); @@ -67,19 +71,15 @@ builder.nextLine(); builder.append("Properties"); - builder.nextLine(); - - builder.append(""); - builder.nextLine(); - - builder.append(""); - builder.nextLine(); + for(int x=0; x<_propertyCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } - builder.append(""); - builder.nextRow(-6); + builder.nextRow(_propertyCount*-2); scrollPane = new JScrollPane(_properties); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _propertyCount*2+1)); + builder.nextRow(_propertyCount*2); builder.nextLine(); } @@ -92,4 +92,6 @@ private JTextArea _description = new JTextArea(3, 20); private JTextField _dbHome = new JTextField(20); private TableField _properties = new TableField("Name", "Value"); + private int _descriptionCount = 1; + private int _propertyCount = 3; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java --- a/java/src/IceGridGUI/LiveDeployment/GraphView.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java 2013-08-29 02:20:24.966458905 +0200 @@ -87,6 +87,7 @@ import java.text.DecimalFormat; +/* XXX: No JavaFX import javafx.application.Platform; import javafx.embed.swing.JFXPanel; @@ -107,6 +108,7 @@ import javafx.scene.input.Dragboard; import javafx.util.StringConverter; +*/ import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.builder.DefaultFormBuilder; @@ -170,6 +172,7 @@ final Runnable r = item.runnable; if(item.javafx) { +/* XXX: No JavaFX Platform.runLater(new Runnable() { @Override @@ -185,6 +188,7 @@ } } }); +*/ } else { @@ -220,6 +224,7 @@ private java.util.List _queue = new java.util.LinkedList(); } +/* XXX: No JavaFX class TimeFormatter extends StringConverter { TimeFormatter(String format) @@ -266,6 +271,7 @@ private DateFormat _dateFormat; } +*/ class TransferHandler extends javax.swing.TransferHandler { @@ -418,7 +424,9 @@ // // Don't destroy JavaFX when the frame is disposed. // +/* XXX: No JavaFX Platform.setImplicitExit(false); +*/ setIconImage(Utils.getIcon("/icons/16x16/metrics_graph.png").getImage()); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() @@ -585,6 +593,7 @@ // // Remove series from the chart, in JavaFx thread. // +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -617,6 +626,7 @@ } } }, true); +*/ } }; delete.setEnabled(false); @@ -689,6 +699,7 @@ _legendTable.setAutoCreateRowSorter(true); +/* XXX: No JavaFX final JFXPanel fxPanel = new JFXPanel(); fxPanel.setMinimumSize(new Dimension(0, 200)); fxPanel.setPreferredSize(new Dimension(800, 400)); @@ -702,9 +713,12 @@ scrollPane.setMinimumSize(new Dimension(0, 50)); scrollPane.setPreferredSize(new Dimension(800, 200)); _splitPane.setBottomComponent(scrollPane); +*/ DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("fill:pref:grow", "fill:pref:grow, pref")); +/* XXX: No JavaFX builder.append(_splitPane); +*/ builder.nextLine(); JPanel panel = builder.getPanel(); @@ -716,6 +730,7 @@ // // initialize the scene in JavaFX thread. // +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -774,6 +789,7 @@ fxPanel.setScene(scene); } }, true); +*/ pack(); if(!loadPreferences()) @@ -788,7 +804,9 @@ { setLocationRelativeTo(_coordinator.getMainFrame()); } +/* XXX: No JavaFX _splitPane.setDividerLocation(400); +*/ } setVisible(true); @@ -842,6 +860,7 @@ // // Remove series from the chart, in JavaFx thread. // +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -875,6 +894,7 @@ } } }, true); +*/ } private boolean showInfo() @@ -909,7 +929,9 @@ preferences.putInt("width", rect.width); preferences.putInt("height", rect.height); preferences.putBoolean("maximized", getExtendedState() == Frame.MAXIMIZED_BOTH); +/* XXX: No JavaFX preferences.putInt("splitLocation", _splitPane.getDividerLocation()); +*/ preferences.putInt("sampleInterval", getRefreshPeriod()); preferences.putInt("maximumSamples", getMaximumSamples()); @@ -941,7 +963,9 @@ { setExtendedState(Frame.MAXIMIZED_BOTH); } +/* XXX: No JavaFX _splitPane.setDividerLocation(_preferences.node("GraphView").getInt("splitLocation", 600)); +*/ for(int i = _columnNames.length -1; i >= 0; --i) { int pos = _legendTable.convertColumnIndexToView(preferences.getInt("columnPos" + Integer.toString(i), i)); @@ -996,6 +1020,7 @@ // // Must run in JavaFX thread. // +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -1094,6 +1119,7 @@ } } }, true); +*/ } // @@ -1104,6 +1130,7 @@ // void addSeries(final MetricsRow row) { +/* XXX: No JavaFX XYChart.Series series = new XYChart.Series(); row.series.push(series); _chart.getData().add(series); @@ -1157,6 +1184,7 @@ } }); } +*/ } private void addData(final MetricsViewInfo info, final Map data, @@ -1165,6 +1193,7 @@ // // Update the graph series in JavaFX thread. // +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -1280,20 +1309,24 @@ }, false); } }, true); +*/ } int seriesSize(MetricsRow row) { int size = 0; +/* XXX: No JavaFX for(int i = 0; i < row.series.size(); ++i) { size += row.series.get(i).getData().size(); } +*/ return size; } void adjustSize(MetricsRow row) { +/* XXX: No JavaFX int samples = seriesSize(row); final int n = getMaximumSamples(); while(samples > n) @@ -1325,6 +1358,7 @@ } } } +*/ } synchronized private void startRefreshThread() @@ -1372,6 +1406,7 @@ synchronized void setDateFormat(String dateFormat) { _dateFormat = dateFormat; +/* XXX: No JavaFX _timeFormater.setDateFormat(dateFormat); // // Update the horizontal axis label, in JavaFx thread. @@ -1384,6 +1419,7 @@ _xAxis.setLabel("Time (" + getDateFormat() + ")"); } }, true); +*/ } synchronized private void setMaximumSamples(final int samples) @@ -1425,14 +1461,20 @@ class MetricsRow { - public MetricsRow(MetricsViewInfo info, MetricsCell cell, String color, XYChart.Series series) + public MetricsRow(MetricsViewInfo info, MetricsCell cell, String color +/* XXX: No JavaFX + , XYChart.Series series +*/ + ) { this.visible = true; this.disabled = false; this.info = info; this.cell = cell; this.color = color; +/* XXX: No JavaFX this.series.push(series); +*/ } boolean visible; @@ -1444,7 +1486,9 @@ // Stack of all the chart series used to represent this metrics object // new values are added to the chart series at the top. // +/* XXX: No JavaFX Stack> series = new Stack>(); +*/ } class LegendTableModel extends javax.swing.table.AbstractTableModel @@ -1617,6 +1661,7 @@ if(_columnNames[columnIndex].equals("Show")) { row.visible = ((Boolean)value).booleanValue(); +/* XXX: No JavaFX _queue.enqueue(new Runnable() { @Override @@ -1628,9 +1673,11 @@ } } }, true); +*/ } else if(_columnNames[columnIndex].equals("Scale")) { +/* XXX: No JavaFX double s1 = ((Double)getValueAt(rowIndex, columnIndex)).doubleValue(); double s2 = ((Double)value).doubleValue(); for(int i = 0; i < row.series.size(); ++i) @@ -1638,6 +1685,7 @@ updateScaleFactor(row.series.get(i), s1, s2); } row.cell.setScaleFactor(((Double)value).doubleValue()); +*/ } else if(_columnNames[columnIndex].equals("Color")) { @@ -1649,10 +1697,12 @@ row.color = "#" + String.format("%02X", color.getRed()) + String.format("%02X", color.getGreen()) + String.format("%02X", color.getBlue()); +/* XXX: No JavaFX for(int i = 0; i < row.series.size(); ++i) { updateSeriesColor(row.series.get(i), row.color); } +*/ } fireTableCellUpdated(rowIndex, columnIndex); } @@ -1714,6 +1764,7 @@ private Map _rows = new HashMap(); } +/* XXX: No JavaFX void updateScaleFactor(final XYChart.Series series, final double s1, final double s2) { @@ -1823,6 +1874,7 @@ sb.append("-fx-stroke-width: 3;"); _styles.put(seriesClass, sb.toString()); } +*/ static class DecimalRenderer extends DefaultListCellRenderer { @@ -1967,12 +2019,16 @@ private String[] _dateFormats = new String[]{"HH:mm:ss", "mm:ss"}; private String _dateFormat = _dateFormats[0]; +/* XXX: No JavaFX private final TimeFormatter _timeFormater = new TimeFormatter(_dateFormat); +*/ private final Object _monitor = new Object(); +/* XXX: No JavaFX private LineChart _chart; private NumberAxis _xAxis; private NumberAxis _yAxis; +*/ private final static String[] _columnNames = new String[]{"Show", "Node", "Server", "Metrics View Name", "Metrics Name", "Metrics Id", "Metrics Field", "Scale", @@ -2020,7 +2076,9 @@ private final JTable _legendTable; private final LegendTableModel _legendModel = new LegendTableModel(); +/* XXX: No JavaFX private JSplitPane _splitPane; +*/ private final Map _styles = new HashMap(); @@ -2046,6 +2104,8 @@ private final WorkQueue _queue; private final Preferences _preferences; +/* XXX: No JavaFX private final static DataFormat LocalObjectMimeType = new DataFormat("application/x-java-jvm-local-objectref"); +*/ } diff -ruN a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -262,6 +262,8 @@ } } } + _metricCount = _properties.getPropertyAsIntWithDefault("IceGridGUI.MetricCount", + root.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.MetricCount", _metricCount)); } public int getRefreshPeriod() @@ -734,13 +736,16 @@ { public void actionPerformed(ActionEvent e) { +/* XXX: No JavaFX GraphView view = node.getCoordinator().createGraphView(); view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node), entry.getKey(), rows)); +*/ } }); addToGraph.add(newGraph); +/* XXX: No JavaFX GraphView[] graphs = node.getCoordinator().getGraphViews(); for(final GraphView view : graphs) { @@ -755,6 +760,7 @@ } }); } +*/ popup.show(e.getComponent(), e.getX(), e.getY()); } } @@ -929,21 +935,15 @@ CellConstraints cc = new CellConstraints(); builder.appendSeparator(title); builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-10); + for(int x=0; x<_metricCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_metricCount*-2); JScrollPane scrollPane = new JScrollPane(table); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 10)); - builder.nextRow(10); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _metricCount*2)); + builder.nextRow(_metricCount*2); builder.nextLine(); } @@ -1698,5 +1698,6 @@ private static Ice.Properties _properties; private static String[] _sectionSort; private static Map _sectionNames = new HashMap(); + private static int _metricCount = 5; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java --- a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -84,6 +84,7 @@ } _loadFactor.setSortedMap(node.getLoadFactors()); + _loadFactorCount = node.getRoot().getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.LoadFactorCount", _loadFactorCount); } void setLoad(String load, Node node) @@ -117,20 +118,16 @@ builder.appendSeparator("Configuration"); builder.append("Load Factor"); - builder.nextLine(); - - builder.append(""); - builder.nextLine(); - - builder.append(""); - builder.nextLine(); + for(int x=0; x<_loadFactorCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } - builder.append(""); - builder.nextRow(-6); + builder.nextRow(_loadFactorCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_loadFactor); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _loadFactorCount*2+1)); + builder.nextRow(_loadFactorCount*2); builder.nextLine(); } @@ -150,4 +147,5 @@ private TableField _loadFactor = new TableField("Application", "Value"); private Node _target; + private int _loadFactorCount = 3; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java --- a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -309,71 +309,41 @@ builder.appendSeparator("Deployed Applications"); builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-14); + for(int x=0; x<_deployedApplicationCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_deployedApplicationCount*-2); JScrollPane scrollPane = new JScrollPane(_applications); scrollPane.setToolTipText(_applications.getToolTipText()); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 14)); - builder.nextRow(14); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _deployedApplicationCount*2)); + builder.nextRow(_deployedApplicationCount*2); builder.nextLine(); builder.appendSeparator("Dynamic Well-Known Objects"); builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-14); + for(int x=0; x<_dynamicWellKnownObjectCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_dynamicWellKnownObjectCount*-2); scrollPane = new JScrollPane(_objects); scrollPane.setToolTipText(_objects.getToolTipText()); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 14)); - builder.nextRow(14); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _dynamicWellKnownObjectCount*2)); + builder.nextRow(_dynamicWellKnownObjectCount*2); builder.nextLine(); builder.appendSeparator("Dynamic Object Adapters"); builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-14); + for(int x=0; x<_dynamicObjectAdapterCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } + builder.nextRow(_dynamicObjectAdapterCount*-2); scrollPane = new JScrollPane(_adapters); scrollPane.setToolTipText(_adapters.getToolTipText()); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 14)); - builder.nextRow(14); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _dynamicObjectAdapterCount*2)); + builder.nextRow(_dynamicObjectAdapterCount*2); builder.nextLine(); } @@ -390,6 +360,9 @@ _applications.setSortedMap(root.getApplicationMap()); _objects.setObjects(root.getObjects()); _adapters.setAdapters(root.getAdapters()); + _deployedApplicationCount = _target.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DeployedApplicationCount", _deployedApplicationCount); + _dynamicWellKnownObjectCount = _target.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DynamicWellKnownObjectCount", _dynamicWellKnownObjectCount); + _dynamicObjectAdapterCount = _target.getCoordinator().getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DynamicObjectAdapterCount", _dynamicObjectAdapterCount); } private JTextField _hostname = new JTextField(20); @@ -398,4 +371,7 @@ private TableField _adapters = new TableField("ID", "Endpoints", "Replica Group"); private Root _target; + private int _deployedApplicationCount = 7; + private int _dynamicWellKnownObjectCount = 7; + private int _dynamicObjectAdapterCount = 7; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java --- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java 2013-08-29 02:20:24.956458752 +0200 @@ -88,6 +88,11 @@ }; gotoApplication.putValue(Action.SHORT_DESCRIPTION, "View/Edit this application"); _gotoApplication = new JButton(gotoApplication); + _descriptionCount = c.getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DescriptionCount", _descriptionCount); + super.setDescriptionCount(_descriptionCount); + _propertyCount = c.getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.PropertyCount", _propertyCount); + super.setPropertyCount(_propertyCount); + _environmentVariableCount = c.getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.EnvironmentVariableCount", _environmentVariableCount); } void show(Server server) @@ -260,19 +265,16 @@ builder.nextLine(); builder.append("Properties"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - - builder.nextLine(); - builder.append(""); + for(int x=0; x<_propertyCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } - builder.nextRow(-6); + builder.nextRow(_propertyCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_properties); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _propertyCount*2+1)); + builder.nextRow(_propertyCount*2); builder.nextLine(); builder.appendSeparator("Configuration"); @@ -304,16 +306,15 @@ builder.append(_user, 3); builder.nextLine(); builder.append("Environment Variables"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - builder.nextRow(-6); + for(int x=0; x<_environmentVariableCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } + + builder.nextRow(_environmentVariableCount*-2); scrollPane = new JScrollPane(_envs); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _environmentVariableCount*2+1)); + builder.nextRow(_environmentVariableCount*2); builder.nextLine(); builder.append("Activation Mode"); @@ -399,5 +400,8 @@ private JTextField _directories = new JTextField(20); private JToolBar _toolBar; + private int _descriptionCount = 1; + private int _propertyCount = 3; + private int _environmentVariableCount = 3; } diff -ruN a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java --- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java 2013-08-29 02:20:24.966458905 +0200 @@ -60,6 +60,10 @@ }; refresh.putValue(Action.SHORT_DESCRIPTION, "Reread the properties from the service"); _refreshButton = new JButton(refresh); + _descriptionCount = coordinator.getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.DescriptionCount", _descriptionCount); + super.setDescriptionCount(_descriptionCount); + _propertyCount = coordinator.getCommunicator().getProperties().getPropertyAsIntWithDefault("IceGridGUI.PropertyCount", _propertyCount); + super.setPropertyCount(_propertyCount); } void show(Service service) @@ -108,19 +112,16 @@ builder.nextLine(); builder.append("Properties"); - builder.nextLine(); - builder.append(""); - builder.nextLine(); - builder.append(""); - - builder.nextLine(); - builder.append(""); + for(int x=0; x<_propertyCount; x=x+1) { + builder.nextLine(); + builder.append(""); + } - builder.nextRow(-6); + builder.nextRow(_propertyCount*-2); CellConstraints cc = new CellConstraints(); JScrollPane scrollPane = new JScrollPane(_properties); - builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7)); - builder.nextRow(6); + builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, _propertyCount*2+1)); + builder.nextRow(_propertyCount*2); builder.nextLine(); builder.appendSeparator("Configuration"); @@ -198,4 +199,6 @@ private JButton _refreshButton; private TableField _properties = new TableField("Name", "Value"); private JToolBar _toolBar; + private int _descriptionCount = 1; + private int _propertyCount = 3; } diff -ruN a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/SimpleInternalFrame.java --- a/java/src/IceGridGUI/SimpleInternalFrame.java 2013-03-11 16:19:47.000000000 +0100 +++ b/java/src/IceGridGUI/SimpleInternalFrame.java 2013-08-29 02:20:25.007112955 +0200 @@ -35,7 +35,9 @@ import javax.swing.*; import javax.swing.border.AbstractBorder; +/* XXX: No JavaFX import com.jgoodies.common.base.SystemUtils; +*/ /** * A JPanel subclass that has a drop shadow border and @@ -373,8 +375,10 @@ UIManager.getColor("SimpleInternalFrame.activeTitleBackground"); if (c != null) return c; +/* XXX: No JavaFX if (SystemUtils.IS_LAF_WINDOWS_XP_ENABLED) c = UIManager.getColor("InternalFrame.activeTitleGradient"); +*/ return c != null ? c : UIManager.getColor("InternalFrame.activeTitleBackground");