Attachment 664865 Details for Bug 887851 – New patch to remove javafx requirement from IceGrid GUI

[patch] New patch to remove javafx requirement from IceGrid GUI

ice-3.5b-remove-javafx.patch (text/plain), 8.76 KB, created by Mary Ellen Foster on 2012-12-17 13:29:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mary Ellen Foster

Created: 2012-12-17 13:29:06 UTC

Size: 8.76 KB

patch

obsolete

>diff -ur Ice-3.5b.orig/java/src/IceGridGUI/Coordinator.java Ice-3.5b/java/src/IceGridGUI/Coordinator.java
>--- Ice-3.5b.orig/java/src/IceGridGUI/Coordinator.java	2012-12-12 21:15:12.000000000 +0000
>+++ Ice-3.5b/java/src/IceGridGUI/Coordinator.java	2012-12-17 12:22:12.326433606 +0000
>@@ -56,7 +56,6 @@
> import javax.naming.ldap.LdapName;
> import javax.naming.ldap.Rdn;
> 
>-import IceGridGUI.LiveDeployment.GraphView;
> 
> //
> // This class coordinates the communications between the various objects
>@@ -342,7 +341,6 @@
>             // New Graph sub-menu
>             //
>             _newMenu.addSeparator();
>-            _newMenu.add(_newGraph);
> 
>             fileMenu.addSeparator();
>             fileMenu.add(_login);
>@@ -2602,22 +2600,6 @@
>             {
>                 public void actionPerformed(ActionEvent e)
>                 {
>-                    if(_graphViews.size() > 0)
>-                    {
>-                        if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
>-                                                                            "Close all open Metrics Graph Views and logout?",
>-                                                                            "Confirm logout",
>-                                                                            JOptionPane.YES_NO_OPTION))
>-                        {
>-                            return;
>-                        }
>-                        
>-                        java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
>-                        for(GraphView v : views)
>-                        {
>-                            v.close();
>-                        }
>-                    }
>                     _sessionKeeper.logout(true);
>                 }
>             };
>@@ -2657,15 +2639,6 @@
>                                               "Release exclusive write access on the registry");
>         _releaseExclusiveWriteAccess.setEnabled(false);
> 
>-        _newGraph = new AbstractAction("Metrics Graph")
>-            {
>-                public void actionPerformed(ActionEvent e)
>-                {
>-                    createGraphView();
>-                }
>-            };
>-        _newGraph.setEnabled(false);
>-
>         _showLiveDeploymentFilters = new AbstractAction("Filter live deployment")
>             {
>                 public void actionPerformed(ActionEvent e)
>@@ -3076,20 +3049,6 @@
>         _mainFrame.getContentPane().add(_mainPane, BorderLayout.CENTER);
>     }
> 
>-    public GraphView createGraphView()
>-    {
>-        StringBuilder title = new StringBuilder();
>-        title.append("Metrics Graph");
>-        if(_graphViews.size() > 0)
>-        {
>-            title.append(" - ");
>-            title.append(Integer.toString(_graphViews.size()));
>-        }
>-        GraphView view = new GraphView(Coordinator.this, title.toString());
>-        _graphViews.add(view);
>-        return view;
>-    }
>-
>     public LiveDeploymentPane getLiveDeploymentPane()
>     {
>         return _liveDeploymentPane;
>@@ -3204,23 +3163,6 @@
> 
>     void exit(int status)
>     {
>-        if(_graphViews.size() > 0)
>-        {
>-            if(JOptionPane.YES_OPTION != JOptionPane.showConfirmDialog(getMainFrame(),
>-                                                                       "Close all open windows and exit?",
>-                                                                       "Confirm exit",
>-                                                                       JOptionPane.YES_NO_OPTION))
>-            {
>-                return;
>-            }
>-            
>-            java.util.List<GraphView> views = new java.util.ArrayList<GraphView>(_graphViews);
>-            for(GraphView v : views)
>-            {
>-                v.close();
>-            }
>-        }
>-
>         if(_openChooser != null)
>         {
>             File dir = _openChooser.getCurrentDirectory();
>@@ -3426,11 +3368,6 @@
>         _serviceMenu.setEnabled(false);
>     }
> 
>-    public void removeGraphView(GraphView view)
>-    {
>-        _graphViews.remove(view);
>-    }
>-
>     public boolean traceObservers()
>     {
>         return _traceObservers;
>@@ -3455,7 +3392,6 @@
>     {
>         _connected = connected;
>         _statusBar.setConnected(connected);
>-        _newGraph.setEnabled(connected);
>     }
> 
>     public boolean connected()
>@@ -3526,11 +3462,6 @@
>         return _dataDir;
>     }
> 
>-    public GraphView[] getGraphViews()
>-    {
>-        return _graphViews.toArray(new GraphView[_graphViews.size()]);
>-    }
>-
>     //
>     // May run in any thread
>     //
>@@ -3703,8 +3634,6 @@
>     private Action _acquireExclusiveWriteAccess;
>     private Action _releaseExclusiveWriteAccess;
> 
>-    private Action _newGraph;
>-
>     private Action _showLiveDeploymentFilters;
>     private Action _openApplicationFromFile;
>     private Action _openApplicationFromRegistry;
>@@ -3774,7 +3703,5 @@
>     private String _fileParser;
>     private boolean _connected;
> 
>-    private java.util.List<GraphView> _graphViews = new java.util.ArrayList<GraphView>();
>-
>     static private final int HISTORY_MAX_SIZE = 20;
> }
>diff -ur Ice-3.5b.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java Ice-3.5b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
>--- Ice-3.5b.orig/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java	2012-12-12 21:15:12.000000000 +0000
>+++ Ice-3.5b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java	2012-12-17 11:20:23.558547510 +0000
>@@ -701,60 +701,6 @@
>                 table.addMouseListener(new ButtonMouseListener(table));
>                 table.setAutoCreateRowSorter(true);
>                 table.setTransferHandler(new TransferHandler(node));
>-                table.addMouseListener(new MouseAdapter()
>-                    {
>-                        @Override
>-                        public void mousePressed(MouseEvent e)
>-                        {
>-                            createAndShowMenu(e);
>-                        }
>-
>-                        @Override
>-                        public void mouseReleased(MouseEvent e)
>-                        {
>-                            createAndShowMenu(e);
>-                        }
>-
>-                        public void createAndShowMenu(MouseEvent e)
>-                        {
>-                            if(e.isPopupTrigger())
>-                            {
>-                                JPopupMenu popup = new JPopupMenu();
>-                                JMenu addToGraph = new JMenu("Add To Metrics Graph");
>-                                popup.add(addToGraph);
>-                                final Map<String, List<MetricsCell>> rows = getSelectedRows(table, true);
>-                                addToGraph.setEnabled(rows.size() > 0);
>-                                JMenuItem newGraph = new JMenuItem("New Metrics Graph");
>-                                newGraph.addActionListener(new ActionListener()
>-                                        {
>-                                            public void actionPerformed(ActionEvent e)
>-                                            {
>-                                                GraphView view = node.getCoordinator().createGraphView();
>-                                                view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node), 
>-                                                                                               entry.getKey(), rows));
>-                                            }
>-                                        });
>-                                addToGraph.add(newGraph);
>-
>-                                GraphView[] graphs = node.getCoordinator().getGraphViews();
>-                                for(final GraphView view : graphs)
>-                                {
>-                                    JMenuItem item = new JMenuItem(view.getTitle());
>-                                    addToGraph.add(item);
>-                                    item.addActionListener(new ActionListener()
>-                                        {
>-                                            public void actionPerformed(ActionEvent e)
>-                                            {
>-                                                view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node), 
>-                                                                                               entry.getKey(), rows));
>-                                            }
>-                                        });
>-                                }
>-                                popup.show(e.getComponent(), e.getX(), e.getY());
>-                            }
>-                        }
>-                    });
>-
>                 for(Map.Entry<Integer, MetricsField> fieldEntry : model.getMetricFields().entrySet())
>                 {
>                     if(fieldEntry.getValue().getCellRenderer() != null)

Actions: View | Diff

Attachments on bug 887851: 664848 | 664852 | 664863 | 664864 | 664865 | 664866 | 664878