Refactored toolbars/menubars

1 files changed, 8 insertions, 23 deletions

diff --git a/java/src/IceGrid/TreeNode/CommonBaseI.java b/java/src/IceGrid/TreeNode/CommonBaseI.java
index 8aa74eb6168..efd3e39b353 100755
--- a/java/src/IceGrid/TreeNode/CommonBaseI.java
+++ b/java/src/IceGrid/TreeNode/CommonBaseI.java
@@ -16,6 +16,7 @@ import javax.swing.JTree;
 import javax.swing.event.TreeModelEvent;

 import javax.swing.tree.TreePath;

 

+import IceGrid.Actions;

 import IceGrid.SimpleInternalFrame;

 import com.jgoodies.forms.factories.Borders;

 import com.jgoodies.forms.factories.DefaultComponentFactory;

@@ -77,16 +78,15 @@ abstract class CommonBaseI implements CommonBase
 	return false;

     }

 

-    public JPopupMenu getPopupMenu()

+    public Actions getActions()

     {

-	//

-	// Default = no popup menu

-	//

-	return null;

+	return _model.getDefaultActions();

     }

 

     public void displayProperties()

     {

+	_model.setActions(getActions());

+

 	if(_panel == null)

 	{

 	    JLabel label = DefaultComponentFactory.getInstance().createTitle("This element has no property");

@@ -98,8 +98,9 @@ abstract class CommonBaseI implements CommonBase
 	SimpleInternalFrame propertiesFrame = _model.getPropertiesFrame();

 	propertiesFrame.setTitle("Properties");

 	propertiesFrame.setContent(_panel);

-	propertiesFrame.validate();

-	propertiesFrame.repaint();

+	

+	_model.getMainFrame().validate();

+	_model.getMainFrame().repaint();

     }

 

     public Component getTreeCellRendererComponent(

@@ -135,22 +136,6 @@ abstract class CommonBaseI implements CommonBase
 	assert false;

     }

 

-    public Object copy()

-    {

-	return null;

-    }

-

-    public void paste(Object descriptor)

-    {

-	//

-	// Try my parent

-	//

-	if(_parent != null)

-	{

-	    _parent.paste(descriptor);

-	}

-    }

-

     public java.util.List findAllInstances(CommonBase child)

     {

 	assert getIndex(child) != -1;