Changeset 1994

Timestamp:

03/11/08 15:52:15 (9 months ago)

Author:

apatel

Message:

put all the editor actions in its own package. Changed AddCustomAction? from selection action to just an action. Improves the performance as its state is calculated only when it is dipslayed.

Files:

• branches/custome_policy/framework-plugin/src/com/tresys/framework/compiler/translator/SELinuxPolicy.java (modified) (1 diff)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/action (added)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/action/AddCustomPolicy.java (moved) (moved from branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/custom/AddCustomPolicy.java) (8 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/action/RemoveCustomPolicy.java (added)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/GraphicPolicyEditor.java (modified) (2 diffs)
• branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/GraphicPolicyEditorContextMenuProvider.java (modified) (4 diffs)

branches/custome_policy/framework-plugin/src/com/tresys/framework/compiler/translator/SELinuxPolicy.java

@@ -125 +125 @@
-        }
-        
+        public SELinuxPolicy (Linkage i_linkage, boolean i_bCustomizationTemplates)
+        {
+                m_linkage = i_linkage;
+                m_moduleName = "customization";
+        }
+        
-        protected void finalize ()
-                throws Throwable

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/action/AddCustomPolicy.java

@@ -8 +8 @@
- */
-
-custom
+action
-
-import java.io.ByteArrayInputStream;
@@ -16 +16 @@
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-gef.ui.actions.Selection
+jface.action.
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
@@ -36 +36 @@
-import com.tresys.framework.plugin.editor.policy.graphic.model.Shape;
-import com.tresys.framework.plugin.editor.policy.graphic.parts.AbstractConnectionEditPart;
-import com.tresys.framework.plugin.editor.policy.graphic.parts.AccessEditPart;
-import com.tresys.framework.plugin.editor.policy.graphic.parts.DomainEditPart;
-import com.tresys.framework.plugin.editor.policy.graphic.parts.PolicyEditPart;
-import com.tresys.framework.plugin.editor.policy.graphic.parts.ShapeEditPart;
-import com.tresys.slide.plugin.editors.module.ModuleEditor;
-
-public class AddCustomPolicy
-Selection
+
-{
-        
@@ -51 +48 @@
-        public AddCustomPolicy (GraphicPolicyEditor part)
-        {
-part
+"Add Custom Policy..."
-                mEditor = part;
+                setEnabled (false);
+                setToolTipText ("Creates a new module that contains custom policy");
-        }
-
@@ -59 +58 @@
-                return ID;
-        }
-        
-        protected boolean calculateEnabled ()
-        {
-                
-                if( !(getSelection () instanceof StructuredSelection) )
-                        return false;
-                IStructuredSelection selection = (StructuredSelection)getSelection ();
-                
-                if( selection.size () != 1 )
-                        return false;
-                
-                Object selected_item = selection.getFirstElement ();
-                if ( !(selected_item instanceof ShapeEditPart || selected_item instanceof AccessEditPart
-                        || selected_item instanceof DomainEditPart) )
-                        return false;
-                return customizationAllowed (selected_item);
-        }
-
-        /**
-         * @see org.eclipse.gef.ui.actions.EditorPartAction#init()
-         */
-        protected void init ()
-        {
-                setId (getId ());
-                setText ("Add custom Policy...");
-        }
-
-        public void run ()
-        {
-
+
+
+
+
+
+
-                /**
-                 * Warn user ...!
@@ -115 +93 @@
-                                 * and get the file system resource for editor input.
-                                 */
-
+selected_item
-                                if( stream == null )
-                                {
@@ -140 +118 @@
-        }
-        
-final boolean customizationAllowed
+OutputStream getPolicy
-        {
-                boolean supports_customization = false;
-                
-                if( selected_item instanceof PolicyEditPart)
-                {
-                        PolicyEditPart policy_part = (PolicyEditPart)selected_item;
-                        Object model = policy_part.getModel ();
-                        if( model instanceof Shape )
-                        {
-                                Shape shape = (Shape)model;
-                                Component comp = shape.getComponent (); 
-                                if( comp instanceof ICustomPolicy )
-                                {
-                                        ICustomPolicy customization = (ICustomPolicy)comp;
-                                        boolean can_be_customized = customization.supportsCustomPolicy ();
-                                        boolean modified = !customization.hasCustomization ();
-                                        supports_customization = (can_be_customized & modified);
-                                }
-                        }
-                }
-                else if( selected_item instanceof AbstractConnectionEditPart )
-                {
-                        AbstractConnectionEditPart part = (AbstractConnectionEditPart)selected_item;
-                        Object model = part.getModel ();
-                        if( model instanceof Connection)
-                        {
-                                Connection con = (Connection)model;
-                                if( con instanceof ICustomPolicy )
-                                {
-                                        ICustomPolicy customization = (ICustomPolicy)con;
-                                        boolean can_be_customized = customization.supportsCustomPolicy ();
-                                        boolean modified = !customization.hasCustomization ();
-                                        supports_customization = (can_be_customized & modified);
-                                }
-                        }
-                }
-                return supports_customization;
-        }
-        
-        private OutputStream getPolicy()
-        {
-                IStructuredSelection selection = (StructuredSelection)getSelection ();
-                Object selected_item = selection.getFirstElement ();
-                
-                Linkage linkage = mEditor.getSystem ().getLinkage ();
-                SELinuxPolicy policy = new SELinuxPolicy(linkage, null, null);
@@ -229 +164 @@
-        }
-        
-        
-        void print_debug(Object o)
-        {

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/GraphicPolicyEditor.java

@@ -91 +91 @@
-import com.tresys.framework.plugin.builder.GUIErrorHandler;
-import com.tresys.framework.plugin.builder.SELinuxSystem;
-
+
+
-import com.tresys.framework.plugin.editor.policy.IPolicyEditor;
-import com.tresys.framework.plugin.editor.policy.graphic.model.ModelElement;
@@ -857 +858 @@
-                getSelectionActions().add(action.getId());
-                
+                action = new RemoveCustomPolicy(this);
+                registry.registerAction(action);
+                getSelectionActions().add(action.getId());
-}
-        

branches/custome_policy/framework-plugin/src/com/tresys/framework/plugin/editor/policy/graphic/GraphicPolicyEditorContextMenuProvider.java

@@ -15 +15 @@
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.actions.ActionFactory;
-
@@ -22 +24 @@
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-
+import com.tresys.framework.compiler.custom.ICustomPolicy;
-import com.tresys.framework.compiler.linkage.refpolicy.InfoDirection;
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -74 +86 @@
-                                getAction(ActionFactory.DELETE.getId()));
-                
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        
@@ -88 +110 @@
-                super.add (action);
-        }
+        
+        private boolean customizationAllowed()
+        {
+                Object sele = getViewer ().getSelection ();
+                if( !(sele instanceof StructuredSelection) )
+                        return false;
+                IStructuredSelection selection = (StructuredSelection)sele;
+                
+                if( selection.size () != 1 )
+                        return false;
+                
+                Object selected_item = selection.getFirstElement ();
+                if ( !(selected_item instanceof ShapeEditPart || selected_item instanceof AccessEditPart
+                        || selected_item instanceof DomainEditPart) )
+                        return false;
+                
+                boolean supports_customization = false;
+                
+                if( selected_item instanceof PolicyEditPart)
+                {
+                        PolicyEditPart policy_part = (PolicyEditPart)selected_item;
+                        Object model = policy_part.getModel ();
+                        if( model instanceof Shape )
+                        {
+                                Shape shape = (Shape)model;
+                                Component comp = shape.getComponent (); 
+                                if( comp instanceof ICustomPolicy )
+                                {
+                                        ICustomPolicy customization = (ICustomPolicy)comp;
+                                        boolean can_be_customized = customization.supportsCustomPolicy ();
+                                        boolean modified = !customization.hasCustomization ();
+                                        supports_customization = (can_be_customized & modified);
+                                }
+                        }
+                }
+                else if( selected_item instanceof AbstractConnectionEditPart )
+                {
+                        AbstractConnectionEditPart part = (AbstractConnectionEditPart)selected_item;
+                        Object model = part.getModel ();
+                        if( model instanceof Connection)
+                        {
+                                Connection con = (Connection)model;
+                                if( con instanceof ICustomPolicy )
+                                {
+                                        ICustomPolicy customization = (ICustomPolicy)con;
+                                        boolean can_be_customized = customization.supportsCustomPolicy ();
+                                        boolean modified = !customization.hasCustomization ();
+                                        supports_customization = (can_be_customized & modified);
+                                }
+                        }
+                }
+                return supports_customization;
+        }
+
-}